Index: APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Converteerder.cls.xml =================================================================== diff -u -r35383 -r35389 --- APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Converteerder.cls.xml (.../Converteerder.cls.xml) (revision 35383) +++ APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Converteerder.cls.xml (.../Converteerder.cls.xml) (revision 35389) @@ -63,16 +63,29 @@ While E1EDP01Iterator.HasNext() { #Dim E1EDP01 As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDP01 = E1EDP01Iterator.Next() - #Dim ToeleveringDetail As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.ToeleveringDetail = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.dto.ToeleveringDetail).%New() - Set ToeleveringDetail.OrderQuantity = E1EDP01.MENGE - Set ToeleveringDetail.ReasonCode = "V" - Set ToeleveringDetail.PriceDimension = ..BepaalPriceDimension(E1EDP01.E1EDP05) - Set ToeleveringDetail.NetPrice = E1EDP01.E1EDP05.PREIS - Do ..VoegToeOrderLineIdentificationCustomer(ToeleveringDetail,E1EDP01) - Do ..VoegToeOrderLineIdentNumberSupplierBAU(ToeleveringDetail,E1EDP01) - - Do Toelevering.ToeleveringDetail.Insert(ToeleveringDetail) + #dim E1EDP20Iterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(E1EDP01.E1EDP20) + While E1EDP20Iterator.HasNext() + { + #dim E1EDP20 As APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDP20 = E1EDP20Iterator.Next() + #Dim ToeleveringDetail As APPS.EDIExport.AankoopOrderResponse.BLUM.dto.ToeleveringDetail = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.dto.ToeleveringDetail).%New() + + Set ToeleveringDetail.OrderQuantity = E1EDP20.WMENG + Set ToeleveringDetail.DeliveryDateAxBUA = $EXTRACT(E1EDP20.EDATU,3,*) + Set ToeleveringDetail.OrderLineNumberSupplierBAU = "" + Set ToeleveringDetail.ReasonCode = "V" + Set ToeleveringDetail.PriceDimension = ..BepaalPriceDimension(E1EDP01.E1EDP05) + Set ToeleveringDetail.NetPrice = E1EDP01.E1EDP05.PREIS + Set ToeleveringDetail.GrossPrice = "0000000.00" + Set ToeleveringDetail.DelDateCode = "2" + Do ..VoegToeOrderLineIdentificationCustomer(ToeleveringDetail,E1EDP01) + Do ..VoegToeOrderLineIdentNumberSupplierBAU(ToeleveringDetail,E1EDP01) + + + Do Toelevering.ToeleveringDetail.Insert(ToeleveringDetail) + + } + } ]]> @@ -114,22 +127,6 @@ Quit "2" ]]> - - - - Index: vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Converteerder/Converteer/Test.cls.xml =================================================================== diff -u -r35383 -r35389 --- vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Converteerder/Converteer/Test.cls.xml (.../Test.cls.xml) (revision 35383) +++ vhUnitTest/APPS/EDIExport/AankoopOrderResponse/impl/BLUM/Converteerder/Converteer/Test.cls.xml (.../Test.cls.xml) (revision 35389) @@ -21,17 +21,63 @@ Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringHeader.CurrencyInCOScode ,"W30") Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringHeader.AverageTransportTime ,"000") - Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.Count(),2) + Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.Count(),3) Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).OrderQuantity,"500") + Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).DeliveryDateAxBUA,"160106") + Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).OrderLineNumberSupplierBAU,"") + Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).GrossPrice,"0000000.00") Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).ReasonCode,"V") Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).PriceDimension,"2") Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).NetPrice,"") Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).OrderLineIdentificationCustomer,"277788.01 ") + Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).IdentNumberSupplierBAU,"09002253") + Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(1).DelDateCode,"2") + Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(2).OrderQuantity,"5") + Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(2).DeliveryDateAxBUA,"160106") Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(2).PriceDimension,"3") Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(2).NetPrice,"0000082.36") + + Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(3).OrderQuantity,"10") + Do $$$AssertEquals(COASO.ToeleveringList.GetAt(1).ToeleveringDetail.GetAt(3).DeliveryDateAxBUA,"160107") ]]> + + + + + + + + + + + + Index: vhTest/Utils/APPS/EDIExport/AankoopOrderResponse/BLUM/XML/ORDERS05.cls.xml =================================================================== diff -u -r35383 -r35389 --- vhTest/Utils/APPS/EDIExport/AankoopOrderResponse/BLUM/XML/ORDERS05.cls.xml (.../ORDERS05.cls.xml) (revision 35383) +++ vhTest/Utils/APPS/EDIExport/AankoopOrderResponse/BLUM/XML/ORDERS05.cls.xml (.../ORDERS05.cls.xml) (revision 35389) @@ -82,7 +82,7 @@ Set E1EDP01 = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDP01).%New() Do ORDERS05.IDOC.E1EDP01.Insert(E1EDP01) Set ORDERS05.IDOC.E1EDP01.GetAt(2).POSEX = "44" - Set ORDERS05.IDOC.E1EDP01.GetAt(2).MENGE = "5" + Set ORDERS05.IDOC.E1EDP01.GetAt(2).MENGE = "15" Set ORDERS05.IDOC.E1EDP01.GetAt(2).MENEE = "PCE" Set E1EDP02 = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDP02).%New() Do ORDERS05.IDOC.E1EDP01.GetAt(2).E1EDP02.Insert(E1EDP02) @@ -93,6 +93,12 @@ Do ORDERS05.IDOC.E1EDP01.GetAt(2).E1EDP20.Insert(E1EDP20) Set ORDERS05.IDOC.E1EDP01.GetAt(2).E1EDP20.GetAt(1).WMENG = "5" Set ORDERS05.IDOC.E1EDP01.GetAt(2).E1EDP20.GetAt(1).EDATU = "20160106" + + Set E1EDP20 = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDP20).%New() + Do ORDERS05.IDOC.E1EDP01.GetAt(2).E1EDP20.Insert(E1EDP20) + Set ORDERS05.IDOC.E1EDP01.GetAt(2).E1EDP20.GetAt(2).WMENG = "10" + Set ORDERS05.IDOC.E1EDP01.GetAt(2).E1EDP20.GetAt(2).EDATU = "20160107" + Set E1EDP19 = ##class(APPS.EDIExport.AankoopOrderResponse.BLUM.XML.E1EDP19).%New() Do ORDERS05.IDOC.E1EDP01.GetAt(2).E1EDP19.Insert(E1EDP19) Set ORDERS05.IDOC.E1EDP01.GetAt(2).E1EDP19.GetAt(1).QUALF = "002"