Index: AX/Uitgaand/EC/DataAX/impl/HelperOrdersConverteren.cls.xml =================================================================== diff -u -r55704 -r62360 --- AX/Uitgaand/EC/DataAX/impl/HelperOrdersConverteren.cls.xml (.../HelperOrdersConverteren.cls.xml) (revision 55704) +++ AX/Uitgaand/EC/DataAX/impl/HelperOrdersConverteren.cls.xml (.../HelperOrdersConverteren.cls.xml) (revision 62360) @@ -99,7 +99,7 @@ Set pxLijn.GrootteOrde=$S(+^||ECCache("D",OrderId,"DTL",VolgNr,"PRICEUNIT")=100:"%",1:"") Set pxLijn.TotaalPrijs=+^||ECCache("D",OrderId,"DTL",VolgNr,"LINEAMOUNT") Set pxLijn.Type=$S(pxLijn.Aantal<0:"R",1:"L") ; Retour of Levering - Set pxLijn.Status=..TranslateStatus(pxLijn.PRNr,pxLijn.Aantal,^||ECCache("D",OrderId,"DTL",VolgNr,"SALESSTATUS"),^||ECCache("D",OrderId,"DTL",VolgNr,"ADUORDERSTATUSID"),^||ECCache("D",OrderId,"DTL",VolgNr,"SALESTYPE"),^||ECCache("D",OrderId,"DTL",VolgNr,"ADUJOURNALTYPE"),^||ECCache("D",OrderId,"DTL",VolgNr,"MCRHOLDCODE")) + Set pxLijn.Status=..TranslateStatus(pxLijn.PRNr,pxLijn.Aantal,^||ECCache("D",OrderId,"DTL",VolgNr,"SALESSTATUS"),^||ECCache("D",OrderId,"DTL",VolgNr,"ADUORDERSTATUSID"),^||ECCache("D",OrderId,"DTL",VolgNr,"SALESTYPE"),^||ECCache("D",OrderId,"DTL",VolgNr,"ADUJOURNALTYPE"),^||ECCache("D",OrderId,"DTL",VolgNr,"MCRHOLDCODE"),$G(^||ECCache("D",OrderId,"DTL",VolgNr,"VALIDATIECODE"))) If ^||ECCache("D",OrderId,"DTL",VolgNr,"SALESTYPE")=3 ; alleen bij orders die de CTP gepasseerd zijn, dus zonder actieve holdcode { Set pxLijn.VerwachteLeverDatum=$zdh(^||ECCache("D",OrderId,"DTL",VolgNr,"RECEIPTDATECONFIRMED"),3) @@ -125,7 +125,7 @@ -PRNr:%String,Aantal:%Integer,SalesLineStatus:%String,BlokkeerStatus:%String,SalesOrderType:%String,JournalType:%String,HoldCode:%String +PRNr:%String,Aantal:%Integer,SalesLineStatus:%String,BlokkeerStatus:%String,SalesOrderType:%String,JournalType:%String,HoldCode:%String,ValidatieCode:%String '' and Hold.INVENTREFID = ORD.SALESID" - _" order by hold.INVENTREFID ,case hold.MCRHOLDCODE when 'VOORUIT' then 1 when 'REMBOURS' then 2 else 9 end asc) as MCRHOLDCODE" + _" order by hold.INVENTREFID ,case hold.MCRHOLDCODE when 'VOORUIT' then 1 when 'REMBOURS' then 2 else 9 end asc) as MCRHOLDCODE," + _" (select top 1 r.LOG from VHVALENTITYRUN r where r.PARTITION = ord.PARTITION and r.DATAAREAID = ord.DATAAREAID and r.ENTITY = 2 and r.REFRECID = ord.recid and r.STATUS in (2,3) and ord.DOCUMENTSTATUS=0 ) as VALIDATIECODE " _" from SalesLine " _" join SalesTable as ORD on SalesLine.SALESID = ORD.SALESID and SalesLine.DATAAREAID = ORD.DATAAREAID and SalesLine.PARTITION = ORD.PARTITION " _" join InventTransOrigin on InventTransOrigin.INVENTTRANSID = SalesLine.INVENTTRANSID and InventTransOrigin.DATAAREAID = SalesLine.DATAAREAID and " @@ -74,9 +75,9 @@ _" and SalesLine.ITEMID=Kenmerk.ITEMID " _" and InventDim.ConfigId<>'' " _" and Kenmerk.PARTITION=SalesLine.PARTITION" - _" left outer join AduCustomerFormNotes as ProdNotes on ProdNotes.REFTABLEID=359 and ProdNotes.REFRECID=SalesLine.RECID and ProdNotes.ADUBODYTYPE=5 and ProdNotes.PARTITION=SalesLine.PARTITION " - _" left outer join AduCustomerFormNotes as LijnNotes on LijnNotes.REFTABLEID=359 and LijnNotes.REFRECID=SalesLine.RECID and LijnNotes.ADUBODYTYPE=1 and LijnNotes.PARTITION=SalesLine.PARTITION " - _" left outer join AduCustomerFormNotes as OrdNotes on OrdNotes.REFTABLEID=366 and OrdNotes.REFRECID=ORD.RECID and OrdNotes.ADUBODYTYPE=1 and OrdNotes.PARTITION=ORD.PARTITION " + _" left outer join AduCustomerFormNotes as ProdNotes on ProdNotes.REFTABLEID=359 and ProdNotes.REFRECID=SalesLine.RECID and ProdNotes.ADUBODYTYPE=5 and ProdNotes.PARTITION=SalesLine.PARTITION and ProdNotes.DATAAREAID=SalesLine.DATAAREAID" + _" left outer join AduCustomerFormNotes as LijnNotes on LijnNotes.REFTABLEID=359 and LijnNotes.REFRECID=SalesLine.RECID and LijnNotes.ADUBODYTYPE=1 and LijnNotes.PARTITION=SalesLine.PARTITION and LijnNotes.DATAAREAID=SalesLine.DATAAREAID" + _" left outer join AduCustomerFormNotes as OrdNotes on OrdNotes.REFTABLEID=366 and OrdNotes.REFRECID=ORD.RECID and OrdNotes.ADUBODYTYPE=1 and OrdNotes.PARTITION=ORD.PARTITION and OrdNotes.DATAAREAID=ORD.DATAAREAID " _" where ORD.SALESTYPE = 3 and SalesLine.PARTITION = 5637144576 and SalesLine.DataAreaID='vhbe'" ; SalesType values: Journal = 0, Sales (order) = 3, Return order = 4