Index: OBJTimpl/WMSOrder/ZendInitieleVoorraad.cls.xml
===================================================================
diff -u -r66564 -r67303
--- OBJTimpl/WMSOrder/ZendInitieleVoorraad.cls.xml	(.../ZendInitieleVoorraad.cls.xml)	(revision 66564)
+++ OBJTimpl/WMSOrder/ZendInitieleVoorraad.cls.xml	(.../ZendInitieleVoorraad.cls.xml)	(revision 67303)
@@ -52,7 +52,7 @@
  . Do STORE^PRSTOCK("F","O",PRNr,Aantal,"OBJT Overdracht initiele voorraad")
  . ;Fase 1 : product markeren als Langgoed -> VerticaleLift
  . Do $$$PRSet($$$OpslagZone,3)
- . Do ZEND^EWPR(PRNr)
+ . Do ZEND^EWPR(PRNr,1)
 ]]></Implementation>
 </Method>
 
Index: OBJTimpl/Convert/StockIntake.cls.xml
===================================================================
diff -u
--- OBJTimpl/Convert/StockIntake.cls.xml	(revision 0)
+++ OBJTimpl/Convert/StockIntake.cls.xml	(revision 67303)
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="OBJTimpl.Convert.StockIntake">
+<IncludeCode>Prod.Product,BL.Derde.LevSpecifiek</IncludeCode>
+<Super>TECH.RegisteredObject</Super>
+
+<Property name="VertrekplaatsConverteerder">
+<Type>OBJTimpl.WMSOrder.VertrekplaatsConverteerder</Type>
+</Property>
+
+<Method name="%OnNew">
+<Description>
+d ##class(OBJTimpl.Convert.StockIntake).%New().LeesTekstBestand()
+d ##class(OBJTimpl.Convert.StockIntake).%New().ExportXMLBestand()</Description>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="LeesTekstBestand">
+<Implementation><![CDATA[
+	Set reader=##class(TECH.FileReader).%New("\\notes01\shared\p v\Stock intake - data.txt")
+	Do reader.SetDelimiter($C(9)) ; optioneel, default is TAB
+	Do reader.SetHeaderRow(1) ; optioneel, default = 1
+	Do reader.SetFirstDataRow(2) ; optioneel, default = 2
+	Kill ^||OBJTConvert
+	set cnt=0
+    While reader.Next() 
+    {
+		set cnt=cnt+1
+ 		Set fullname=reader.Data("fullname")
+ 		Set name=reader.Data("name")
+ 		Set packaging=reader.Data("packaging")
+ 		Set containertype=reader.Data("containertype")
+ 		Set qty=reader.Data("qty")
+ 		Set itemname=reader.Data("itemname")
+ 		Set qualitycontrolstatusid=reader.Data("qualitycontrolstatusid")
+ 		Set ^||OBJTConvert(fullname)=$LB(fullname)
+	 	Set ^||OBJTConvert(fullname,name)=$LB(name,packaging,containertype)
+ 		Set lbQty=$G(^||OBJTConvert(fullname,name,itemname))
+ 		If $L(lbQty)=0 
+ 		{
+ 			set lbQty=$Lb(itemname,0,qualitycontrolstatusid)
+ 		}
+ 		set $li(lbQty,2)=$li(lbQty,2)+qty
+ 		Set ^||OBJTConvert(fullname,name,itemname)=lbQty
+ 		;zw ^||OBJTConvert
+ 	}
+	w cnt
+]]></Implementation>
+</Method>
+
+<Method name="ExportXMLBestand">
+<Implementation><![CDATA[
+	/*
+	<inventory>
+	<location>
+		<fullname>01D20A01</fullname>
+		<container>
+			<name>01D20A01</name>
+			<packaging>WELLKARTON 529 A OT    OR_Paletlaag-12 ea-13.1cm_Palet PE1</packaging>
+			<containertype>Palet PE1</containertype>
+			<inventoryitem>
+				<qty>33</qty>
+				<itemname>0.318.913.1</itemname>
+				<qualitycontrolstatusid>RELEASED</qualitycontrolstatusid>
+			</inventoryitem>*/
+	
+	
+	Set writer=##class(%XML.Writer).%New()
+	Set writer.Charset="UTF-8"
+	Set writer.Indent=1
+	Set sc=writer.OutputToFile("\\notes01\shared\p v\Stock intake - data9.xml")
+	Set sc=writer.RootElement("inventory")
+	Set fullname=$o(^||OBJTConvert(""))
+	set cnt=0
+	while $L(fullname)
+	{
+		Set lbLoc=^||OBJTConvert(fullname)
+		;w "+"
+		Set sc=writer.Element("location")
+		Set sc=writer.Element("fullname")
+		Set sc=writer.Write($li(lbLoc,1))
+		Set sc=writer.EndElement()
+		
+		Set name=$o(^||OBJTConvert(fullname,""))
+		While $L(name)
+		{
+			Set lbPal=^||OBJTConvert(fullname,name)
+			Set sc=writer.Element("container")
+			Set sc=writer.Element("name")
+			Set sc=writer.Write($li(lbPal,1))
+			Set sc=writer.EndElement()
+			Set sc=writer.Element("packaging")
+			Set sc=writer.Write($li(lbPal,2))
+			Set sc=writer.EndElement()
+			Set sc=writer.Element("containertype")
+			Set sc=writer.Write($li(lbPal,3))
+			Set sc=writer.EndElement()
+	
+			Set itemname=$o(^||OBJTConvert(fullname,name,""))
+			while $L(itemname)
+			{	set cnt=cnt+1
+				w:cnt#100=0 cnt," "
+				Set lbQty=^||OBJTConvert(fullname,name,itemname)
+				Set sc=writer.Element("inventoryitem")
+					Set sc=writer.Element("qty")
+					Set sc=writer.Write($li(lbQty,2))
+					Set sc=writer.EndElement()
+					Set sc=writer.Element("itemname")
+					Set sc=writer.Write($li(lbQty,1))
+					Set sc=writer.EndElement()
+					Set sc=writer.Element("qualitycontrolstatusid")
+					Set sc=writer.Write($li(lbQty,3))
+					Set sc=writer.EndElement()
+
+				Set sc=writer.EndElement()  //inventoryitem
+				Set itemname=$o(^||OBJTConvert(fullname,name,itemname))
+			}
+	
+			Set sc=writer.EndElement() //container
+			Set name=$o(^||OBJTConvert(fullname,name))
+		}
+		Set sc=writer.EndElement() //location
+		Set fullname=$o(^||OBJTConvert(fullname))
+	}
+
+
+	Set sc=writer.EndRootElement()   ; inventory
+	set writer=""
+]]></Implementation>
+</Method>
+
+<Method name="ExportValidProducts">
+<Description>
+d ##class(OBJTimpl.Convert.StockIntake).%New().ExportValidProducts()</Description>
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	Set rs=##class(%ResultSet).%New("%DynamicQuery:SQL")
+	Set sc=rs.Prepare("select OBJTItemID,Product,ItemID from OBJTimpl_PM.OBJTIdentNrMapping ")
+	If $$$ISERR(sc) Do DisplayError^%apiOBJ(sc) Quit
+	Set sc=rs.Execute() 
+	If $$$ISERR(sc) Do DisplayError^%apiOBJ(sc) Quit
+	Set it=##class(TECH.ResultSetIterator).%New(rs)
+	Set Device=$$OPEN^vhDEV(,"AX nr OBJT.txt","W","T")
+	Use Device
+	Set ObjtValid=##class(OBJTimpl.CheckObjectiveFase).%New()
+	Write "PRNr",*9,"AXItemID",*9,"OBJTItemID",*9,"Korttekst",!
+	While it.HasNext() {
+		Set rs=it.Next()
+		Set PRNr=rs.Data("Product")
+		Set OBJTItemID=rs.Data("OBJTItemID")
+		Set AXItemID=rs.Data("ItemID")
+		; Producten voor fase 2 maar NIET voor fase 1
+		If PRNr&&$D(^KPR(PRNr,0))&&(($$$PRGet($$$LeveranciersNr)'=$$$LevHalux)||($$$PRGet($$$StockType)=1))&& 'ObjtValid.VoorraadSync(PRNr,"VHBE")
+		{
+			Write PRNr,*9,AXItemID,*9,OBJTItemID,*9,$$$PRGet($$$KortTekst),!
+		}
+		
+	}
+	Do CLOSE^vhDEV(Device)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: OBJTimpl/CheckObjectiveFase.cls.xml
===================================================================
diff -u -r66315 -r67303
--- OBJTimpl/CheckObjectiveFase.cls.xml	(.../CheckObjectiveFase.cls.xml)	(revision 66315)
+++ OBJTimpl/CheckObjectiveFase.cls.xml	(.../CheckObjectiveFase.cls.xml)	(revision 67303)
@@ -26,7 +26,7 @@
 <FormalSpec>PRNr:%Integer</FormalSpec>
 <Implementation><![CDATA[
 	Quit:..GeefFase()=1 ($$$PRGet($$$OpslagZone)=3) ;OBJT 1ste fase : Opslagzone=Langgoed dan VERT liften
-	Quit:..GeefFase()=2 ($$$PRGet($$$LeveranciersNr)'=$$$LevHalux)||($$$PRGet($$$StockType)=1) ;OBJT 2de fase : allen beslag
+	Quit:..GeefFase()=2 ($$$PRGet($$$LeveranciersNr)'=$$$LevHalux)||($$$PRGet($$$StockType)=1) ;OBJT 2de fase : alleen beslag
 	Quit:..GeefFase()=5 1 ;OBJT 5de fase : alle pickings lopen via OBJT en Admin
 	Quit 0 ; voor live gang OBJT
 ]]></Implementation>
@@ -45,7 +45,7 @@
 <FormalSpec>PRNr:%Integer,Entiteit:%String</FormalSpec>
 <Implementation><![CDATA[
 	Quit:..GeefFase()=1 ($$$PRGet($$$OpslagZone)=3)&&(Entiteit="VHBE")  ;OBJT 1ste fase : Langgoed dan VERT liften
-	Quit:..GeefFase()=2 (($$$PRGet($$$LeveranciersNr)'=$$$LevHalux)||($$$PRGet($$$StockType)=1))&&(Entiteit="VHBE") ;OBJT 2 de fase : OBJT kent aleen de VHBE voorraad voor beslag producten
+	Quit:..GeefFase()=2 (($$$PRGet($$$LeveranciersNr)'=$$$LevHalux)||($$$PRGet($$$StockType)=1)||($$$PRGet($$$OpslagZone)=3))&&(Entiteit="VHBE") ;OBJT 2 de fase : OBJT kent aleen de VHBE voorraad voor beslag producten
 	Quit:..GeefFase()=5 1 ;OBJT 5de fase : OBJT beheert de voorraad van zowel HLX als VHBE
 	Quit 0 ; voor live gang OBJT
 ]]></Implementation>
@@ -55,7 +55,7 @@
 <FormalSpec>PRNr:%Integer,Entiteit:%String</FormalSpec>
 <Implementation><![CDATA[
 	Quit:..GeefFase()=1 ($$$PRGet($$$OpslagZone)=3)&&(Entiteit="VHBE")  ;OBJT 1ste fase : Langgoed dan VERT liften
-	Quit:..GeefFase()=2 ($$$PRGet($$$LeveranciersNr)'=$$$LevHalux)||($$$PRGet($$$StockType)=1) ;OBJT 2 de fase : OBJT doet de inboundverwerking voor zowel VHBE als HLX
+	Quit:..GeefFase()=2 (($$$PRGet($$$LeveranciersNr)'=$$$LevHalux)||($$$PRGet($$$StockType)=1)||($$$PRGet($$$OpslagZone)=3)) ;OBJT 2 de fase : OBJT doet de inboundverwerking voor zowel VHBE als HLX
 	Quit:..GeefFase()=5 1 ;OBJT 5de fase : OBJT beheert de voorraad van zowel HLX als VHBE
 	Quit 0 ; voor live gang OBJT
 ]]></Implementation>