Index: OBJTimpl/WMSOrder/ImporteerPicking.cls.xml
===================================================================
diff -u -r67353 -r67365
--- OBJTimpl/WMSOrder/ImporteerPicking.cls.xml	(.../ImporteerPicking.cls.xml)	(revision 67353)
+++ OBJTimpl/WMSOrder/ImporteerPicking.cls.xml	(.../ImporteerPicking.cls.xml)	(revision 67365)
@@ -7,8 +7,9 @@
 en daarna wordt voor de niet doorgegeven producten de voorraad op nul gezet</Description>
 <Super>TECH.RegisteredObject</Super>
 
-<Property name="pxPicking">
-<Type>dtoCorrelatePicking</Type>
+<Property name="rsPicking">
+<Type>TECH.ResultSet</Type>
+<Private>1</Private>
 </Property>
 
 <Property name="CheckOBJTFase">
@@ -23,29 +24,36 @@
 <Type>%Integer</Type>
 </Property>
 
+<Property name="PickLijnenOphaler">
+<Type>OBJTimpl.WMSOrder.OphalenPickLijnenConsolidatie</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
+<FormalSpec>PickLijnenOphaler:OBJTimpl.WMSOrder.OphalenPickLijnenConsolidatie=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Do ##class(dtoCorrelateVoorraadNiveau).%KillExtent()
 	Set ..CheckOBJTFase=##class(OBJTimpl.CheckObjectiveFase).%New()
+	set ..PickLijnenOphaler = $$$Inject(PickLijnenOphaler,##class(OBJTimpl.WMSOrder.OphalenPickLijnenConsolidatie).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
-<Method name="Verwerk">
-<Description>
-Do ##class(OBJTimpl.WMSOrder.ImporteerVoorraadNiveau).%New().Verwerk(##class(TECH.Config.ConfigMgr).Instance().GetString("WMSExchange_RootDir")_"WMSExchange\ObjtNaarAdmin\"_"OBJT Voorraad TEST1.xml")</Description>
-<FormalSpec>XMLreader:%XML.Reader</FormalSpec>
-<Implementation><![CDATA[	Do ..VerwerkBestand(XMLreader)
-]]></Implementation>
-</Method>
+<UDLText name="T">
+<Content><![CDATA[
+/*
+/// Do ##class(OBJTimpl.WMSOrder.ImporteerVoorraadNiveau).%New().Verwerk(##class(TECH.Config.ConfigMgr).Instance().GetString("WMSExchange_RootDir")_"WMSExchange\ObjtNaarAdmin\"_"OBJT Voorraad TEST1.xml")
+Method Verwerk(XMLreader As %XML.Reader)
+{
+	Do ..VerwerkBestand(XMLreader)
+}
 
-<Method name="VerwerkBestand">
-<FormalSpec>XMLreader:%XML.Reader</FormalSpec>
-<Implementation><![CDATA[
+Method VerwerkBestand(XMLreader As %XML.Reader)
+{
 	#include %occStatus
 	Do XMLreader.Rewind()
 	Do XMLreader.Correlate("AfmeldenPicking","OBJTimpl.WMSOrder.dtoCorrelatePicking")
@@ -69,31 +77,36 @@
 		}
 	}
 	Do ..VerwerkEinde()
-]]></Implementation>
-</Method>
+}
+*/
+]]></Content>
+</UDLText>
 
 <Method name="VerwerkWebservice">
 <FormalSpec>PickLijst:OBJTimpl.WMSOrder.dtoAfmeldenPicking</FormalSpec>
 <Implementation><![CDATA[
-	Set it=##class(TECH.ListIterator).%New(PickLijst.PickLijnen)
+	// er van uitgaande dat er maar één consolidatie in de PickLijst zit
+	#dim ConsolidatieNr as %String = PickLijst.PickLijnen.GetAt(1).ConsNr
+	#dim PickLijnIterator as TECH.ResultSetIterator = ..PickLijnenOphaler.GeefIterator(ConsolidatieNr)
 	
 	#dim AantalPerOrderLijn as %CacheString
 	K AantalPerOrderLijn
-	While it.HasNext()
+	While PickLijnIterator.HasNext()
 	{
-		Set ..pxPicking=it.Next()
-		Set AantalPerOrderLijn(..pxPicking.LijnNr) = $Get(AantalPerOrderLijn(..pxPicking.LijnNr),0) + 1 
+		Set ..rsPicking=PickLijnIterator.Next()
+		Set AantalPerOrderLijn(..rsPicking.GetDataByName("LIJNNR")) = $Get(AantalPerOrderLijn(..rsPicking.GetDataByName("LIJNNR")),0) + 1
 	}
 	
-	do it.Reset()
+	Set PickLijnIterator = ..PickLijnenOphaler.GeefIterator(ConsolidatieNr)
+	
 	#dim CountPerOrderLijn as %CacheString
 	k CountPerOrderLijn
-	While it.HasNext()
+	While PickLijnIterator.HasNext()
 	{
-		Set ..pxPicking=it.Next()
-		Set CountPerOrderLijn(..pxPicking.LijnNr) = $Get(CountPerOrderLijn(..pxPicking.LijnNr),0) + 1 
-		#dim Full as %Boolean = (CountPerOrderLijn(..pxPicking.LijnNr) = AantalPerOrderLijn(..pxPicking.LijnNr))
-		Do ..VerwerkPicking(Full,CountPerOrderLijn(..pxPicking.LijnNr)-1)
+		Set ..rsPicking=PickLijnIterator.Next()
+		Set CountPerOrderLijn(..rsPicking.GetDataByName("LIJNNR")) = $Get(CountPerOrderLijn(..rsPicking.GetDataByName("LIJNNR")),0) + 1 
+		#dim Full as %Boolean = (CountPerOrderLijn(..rsPicking.GetDataByName("LIJNNR")) = AantalPerOrderLijn(..rsPicking.GetDataByName("LIJNNR")))
+		Do ..VerwerkPicking(Full,CountPerOrderLijn(..rsPicking.GetDataByName("LIJNNR"))-1)
 	}
 	Do ..VerwerkEinde()
 ]]></Implementation>
@@ -103,33 +116,35 @@
 <FormalSpec>Full:%Boolean,SplitsNummer:%Integer</FormalSpec>
 <ProcedureBlock>0</ProcedureBlock>
 <Implementation><![CDATA[
-	Set ..pxPicking.ConsNr=$E(..pxPicking.ConsNr,5,10) ; YYMM moet erafgehaald worden
+	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((..pxPicking.LijnNr[";"):";",1:", ")
-	Set ..CONSNr=..pxPicking.ConsNr
+	*/
+	#dim Delimiter as %String = $Select((..rsPicking.GetDataByName("LIJNNR")[";"):";",1:", ")
+	
 	Kill C
 	Set C="C01"
 	Set ..VolgNr=..VolgNr+1
 	Set C("VOLGNR")=..VolgNr
 	Set C("CONSNR")=..CONSNr
-	Set C("ORDNR")=$P(..pxPicking.LijnNr,Delimiter)
- 	Set C("OLNR")=$P(..pxPicking.LijnNr,Delimiter,2)
+	Set C("ORDNR")=$P(..rsPicking.GetDataByName("LIJNNR"),Delimiter)
+ 	Set C("OLNR")=$P(..rsPicking.GetDataByName("LIJNNR"),Delimiter,2)
  	Set C("OLSPLITSNR")=SplitsNummer
 	Set C("SOFTV")="V"
- 	Set C("DELTAUIT")=..pxPicking.Aantal
+ 	Set C("DELTAUIT")=+..rsPicking.GetDataByName("AANTAL")
 
     Set C("FULLPARTIAL")=$Select(Full:"F",1:"P")
     Set C("STATUS")=..GeefStatusPicking() ; afhankelijk of het aantal is behaald
 
     ; Defaults
-    Set C("PALKLID")="OBJT"
- 	Set C("DATUM")=$S(..pxPicking.PickingTijdstip="":$H,1:$zdth(..pxPicking.PickingTijdstip,8))
+    Set C("PALKLID")=..rsPicking.GetDataByName("BRONPALLET")
+ 	Set C("DATUM")=$S(..rsPicking.GetDataByName("PICKINGTIJDSTIP")="":$H,1:$zdth(..rsPicking.GetDataByName("PICKINGTIJDSTIP"),8))
  	Set C("SOURCEPALID")=""
- 	Set C("USER")=""
+ 	Set C("USER")=..rsPicking.GetDataByName("USERID")
  	Set C("LOCMSTR")=""
 
     Do ##class(vhLib.OldSchool).InitVars()
@@ -161,10 +176,10 @@
 <Method name="GeefStatusPicking">
 <Implementation><![CDATA[
 	; Als het aantal afwijkt van het gevraagd aantal dan PNOK (picking niet OK)
-	#dim Delimiter = $Select((..pxPicking.LijnNr [ ";"):";",1:", ")
-	#dim ORDNr as %String =$P(..pxPicking.LijnNr,Delimiter)
- 	#dim OLNr as %String =$P(..pxPicking.LijnNr,Delimiter,2)\100
- 	#dim SOLNr as %String =$P(..pxPicking.LijnNr,Delimiter,2)#100*100
+	#dim Delimiter = $Select((..rsPicking.GetDataByName("LIJNNR") [ ";"):";",1:", ")
+	#dim ORDNr as %String =$P(..rsPicking.GetDataByName("LIJNNR"),Delimiter)
+ 	#dim OLNr as %String =$P(..rsPicking.GetDataByName("LIJNNR"),Delimiter,2)\100
+ 	#dim SOLNr as %String =$P(..rsPicking.GetDataByName("LIJNNR"),Delimiter,2)#100*100
  	
  	Quit:'ORDNr||'OLNr||'SOLNr "" 
  	#dim Bestaat as %Boolean = $D(^ORDW("D",..CONSNr,"D",ORDNr,OLNr,SOLNr))
Index: OBJTimpl/WMSOrder/OphalenPickLijnenConsolidatie.cls.xml
===================================================================
diff -u
--- OBJTimpl/WMSOrder/OphalenPickLijnenConsolidatie.cls.xml	(revision 0)
+++ OBJTimpl/WMSOrder/OphalenPickLijnenConsolidatie.cls.xml	(revision 67365)
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="OBJTimpl.WMSOrder.OphalenPickLijnenConsolidatie">
+<IncludeCode>Prod.Product</IncludeCode>
+<Super>TECH.RegisteredObject,TECH.Iterator</Super>
+
+<Property name="Converter">
+<Type>AXimpl.Controle.Order.Ax.AxOrderLijnConverter</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ResultSet">
+<Type>TECH.ResultSet</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="SqlQueryConnection">
+<Type>AXimpl.SqlQueryConnection</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ConfigMgr">
+<Type>TECH.Config.ConfigMgr</Type>
+<Private>1</Private>
+</Property>
+
+<UDLText name="T">
+<Content><![CDATA[
+// d ##class(OBJTimpl.WMSOrder.OphalenVoorraadOpLocatie).%New().Test()
+
+]]></Content>
+</UDLText>
+
+<Method name="Test">
+<FormalSpec>PRNr:%String</FormalSpec>
+<Implementation><![CDATA[
+	Set it=..GeefIterator($G(PRNr,1602161))
+	
+	While it.HasNext()
+	{	
+		set rs=it.Next()
+		write rs.Data("WAREHOUSE")," ",rs.Data("QTYONHAND")
+		w !,$zdth(rs.Data("DTSMODIFICATION"),8), "  ",$$INTDATE^vhLib.DataTypes($P(rs.Data("DTSMODIFICATION"),"-",1,3))
+ 		w "  ",$$INTTIME^vhLib.DataTypes($P($P(rs.Data("DTSMODIFICATION"),"-",4),".",1,3))
+
+	}
+]]></Implementation>
+</Method>
+
+<Method name="%OnNew">
+<FormalSpec>ConfigMgr:TECH.Config.ConfigMgr=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..ConfigMgr = $$$Inject(ConfigMgr,##class(TECH.Config.ConfigMgr).Instance())
+	
+	//d ##class(TECH.Config.ConfigMgr).Instance().SetString("OBJTimpl.DatasourceName","OBJT_ACP")
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GeefIterator">
+<FormalSpec>ConsolidatieNr:%String</FormalSpec>
+<Implementation><![CDATA[
+	#Dim ResultSet as %ResultSet = ..GeefResultSet(ConsolidatieNr)
+	Set Iterator=##class(TECH.ResultSetIterator).%New(ResultSet)
+	Quit Iterator
+]]></Implementation>
+</Method>
+
+<Method name="GeefResultSet">
+<FormalSpec>ConsolidatieNr:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%ResultSet</ReturnType>
+<Implementation><![CDATA[
+    Set rs=##class(%ResultSet).%New("%DynamicQueryGW:SQLGW")
+    Set OBJTConnect=..GeefSQLConnectie()
+	Set Status=""
+    
+	Set SqlStatement="select task.DTSSTART PICKINGTIJDSTIP, outboundOrder.id CONSNR, task.oid, employee.Userid USERID, csitq.name BRONPALLET, csitq.oid, op.name LIJNNR, itemqty.VALUE, task.STATUS, task.SUBSTATUS, task.QTY AANTAL"
+	_ " 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"
+	_ " left join OBJT_WAREHOUSELOCATION location on location.oid = task.TARGETLOCATIONOID"
+	_ " where task.CATEGORY = 'PICK'"
+	_ " and outboundOrder.id=?"
+	_ " and task.SUBSTATUS is null"
+	_ " order by outboundOrder.id"
+    
+    
+    try
+    {
+    	Do rs.Prepare(SqlStatement,,OBJTConnect)
+	    Do rs.Execute(ConsolidatieNr)    
+    } catch {
+	    do OBJTConnect.Disconnect()
+	    do ##class(TECH.ExceptionHandler).Rethrow()
+    }
+    Quit rs
+]]></Implementation>
+</Method>
+
+<Method name="GeefSQLConnectie">
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set SqlConnection =##class(%SQLGatewayConnection).%New()
+    #dim OBJTSqlServer As %String = ..ConfigMgr.GeefString("OBJTimpl.DatasourceName")
+	Do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(SqlConnection.Connect(OBJTSqlServer,"",""))
+    Quit SqlConnection
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>