Index: vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/PickingCompleetConverter/Convert/Test.cls.xml =================================================================== diff -u -r49457 -r51833 --- vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/PickingCompleetConverter/Convert/Test.cls.xml (.../Test.cls.xml) (revision 49457) +++ vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/PickingCompleetConverter/Convert/Test.cls.xml (.../Test.cls.xml) (revision 51833) @@ -26,13 +26,20 @@ Set OrderApiStub = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New() Do OrderApiStub.IndienMethodCall("GeefBon",UitleveringID,$$$ElkeWaarde).DanReturn(StandaardBon) - Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.PickingCompleetConverter).%New(InventoryOutConverterStub, OrderApiStub, ..MaakBouwsteenIteratorFactory(1)) + #dim OrderWMSHoofding As Flow.OrderWMS.Hoofding = ##class(Flow.OrderWMS.Hoofding).%New() + Set OrderWMSHoofding.DueOutTime = $$$CurrentDate + Set OrderWMSHoofdingRepositoryStub = ##class(vhTest.Mock.Flow.OrderWMS.HoofdingRepository).%New() + Do OrderWMSHoofdingRepositoryStub.IndienMethodCall("GeefViaID","123456").DanReturn(OrderWMSHoofding) + + Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.PickingCompleetConverter).%New(InventoryOutConverterStub, OrderApiStub, ..MaakBouwsteenIteratorFactory(1), OrderWMSHoofdingRepositoryStub) + #dim GUID As %String = "{7E53DAF1-A44A-49C7-B0D2-4534E9158C9A}" #dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(Request,GUID) Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).Pick.Count(),1) Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).Pick.GetAt(1).PickId,"123456") + Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).Pick.GetAt(1).ShippingDate,##class(AXimpl.Formatter).%New().FormatDate($$$CurrentDate)) Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).InventSync.Count(),1) ]]> @@ -58,8 +65,14 @@ Set OrderApiStub = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New() Do OrderApiStub.IndienMethodCall("GeefBon",UitleveringID,$$$ElkeWaarde).DanReturn(StandaardBon) - Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.PickingCompleetConverter).%New(InventoryOutConverterStub, OrderApiStub, ..MaakBouwsteenIteratorFactory(1,2)) + #dim OrderWMSHoofding As Flow.OrderWMS.Hoofding = ##class(Flow.OrderWMS.Hoofding).%New() + Set OrderWMSHoofding.DueOutTime = $$$CurrentDate + Set OrderWMSHoofdingRepositoryStub = ##class(vhTest.Mock.Flow.OrderWMS.HoofdingRepository).%New() + Do OrderWMSHoofdingRepositoryStub.IndienMethodCall("GeefViaID","123456").DanReturn(OrderWMSHoofding) + + Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.PickingCompleetConverter).%New(InventoryOutConverterStub, OrderApiStub, ..MaakBouwsteenIteratorFactory(1,2), OrderWMSHoofdingRepositoryStub) + #dim GUID As %String = "{7E53DAF1-A44A-49C7-B0D2-4534E9158C9A}" #dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(Request,GUID) @@ -120,8 +133,14 @@ Set OrderApiStub = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New() Do OrderApiStub.IndienMethodCall("GeefBon",UitleveringID,$$$ElkeWaarde).DanReturn(StandaardBon) - Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.PickingCompleetConverter).%New(InventoryOutConverterStub, OrderApiStub, ..MaakBouwsteenIteratorFactory(2,2)) + #dim OrderWMSHoofding As Flow.OrderWMS.Hoofding = ##class(Flow.OrderWMS.Hoofding).%New() + Set OrderWMSHoofding.DueOutTime = $$$CurrentDate + Set OrderWMSHoofdingRepositoryStub = ##class(vhTest.Mock.Flow.OrderWMS.HoofdingRepository).%New() + Do OrderWMSHoofdingRepositoryStub.IndienMethodCall("GeefViaID","123456").DanReturn(OrderWMSHoofding) + + Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.PickingCompleetConverter).%New(InventoryOutConverterStub, OrderApiStub, ..MaakBouwsteenIteratorFactory(2,2), OrderWMSHoofdingRepositoryStub) + #dim GUID As %String = "{7E53DAF1-A44A-49C7-B0D2-4534E9158C9A}" #dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(Request,GUID) @@ -153,8 +172,14 @@ Set OrderApiStub = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New() Do OrderApiStub.IndienMethodCall("GeefBon",UitleveringID,$$$ElkeWaarde).DanReturn(StandaardBon) - Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.PickingCompleetConverter).%New(InventoryOutConverterStub, OrderApiStub, ..MaakBouwsteenIteratorFactory(1)) + #dim OrderWMSHoofding As Flow.OrderWMS.Hoofding = ##class(Flow.OrderWMS.Hoofding).%New() + Set OrderWMSHoofding.DueOutTime = $$$CurrentDate + Set OrderWMSHoofdingRepositoryStub = ##class(vhTest.Mock.Flow.OrderWMS.HoofdingRepository).%New() + Do OrderWMSHoofdingRepositoryStub.IndienMethodCall("GeefViaID","123456").DanReturn(OrderWMSHoofding) + + Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.PickingCompleetConverter).%New(InventoryOutConverterStub, OrderApiStub, ..MaakBouwsteenIteratorFactory(1), OrderWMSHoofdingRepositoryStub) + #dim GUID As %String = "{7E53DAF1-A44A-49C7-B0D2-4534E9158C9A}" #dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(Request,GUID) @@ -185,8 +210,14 @@ Set OrderApiStub = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New() Do OrderApiStub.IndienMethodCall("GeefBon",UitleveringID,$$$ElkeWaarde).DanReturn(StandaardBon) - Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.PickingCompleetConverter).%New(InventoryOutConverterStub, OrderApiStub, ..MaakBouwsteenIteratorFactory(2)) + #dim OrderWMSHoofding As Flow.OrderWMS.Hoofding = ##class(Flow.OrderWMS.Hoofding).%New() + Set OrderWMSHoofding.DueOutTime = $$$CurrentDate + Set OrderWMSHoofdingRepositoryStub = ##class(vhTest.Mock.Flow.OrderWMS.HoofdingRepository).%New() + Do OrderWMSHoofdingRepositoryStub.IndienMethodCall("GeefViaID","123456").DanReturn(OrderWMSHoofding) + + Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.PickingCompleetConverter).%New(InventoryOutConverterStub, OrderApiStub, ..MaakBouwsteenIteratorFactory(2), OrderWMSHoofdingRepositoryStub) + #dim GUID As %String = "{7E53DAF1-A44A-49C7-B0D2-4534E9158C9A}" #dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(Request,GUID) @@ -258,8 +289,14 @@ Set OrderApiStub = ##class(vhTest.Mock.DOM.VKP.OrderAPI).%New() Do OrderApiStub.IndienMethodCall("GeefBon",UitleveringID,$$$ElkeWaarde).DanReturn(StandaardBon) - Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.PickingCompleetConverter).%New(InventoryOutConverterStub, OrderApiStub, ..MaakBouwsteenIteratorFactory(1)) + #dim OrderWMSHoofding As Flow.OrderWMS.Hoofding = ##class(Flow.OrderWMS.Hoofding).%New() + Set OrderWMSHoofding.DueOutTime = $$$CurrentDate + Set OrderWMSHoofdingRepositoryStub = ##class(vhTest.Mock.Flow.OrderWMS.HoofdingRepository).%New() + Do OrderWMSHoofdingRepositoryStub.IndienMethodCall("GeefViaID","123456").DanReturn(OrderWMSHoofding) + + Set Converter = ##class(AXimpl.Dynamics.InventoryOut.Converter.PickingCompleetConverter).%New(InventoryOutConverterStub, OrderApiStub, ..MaakBouwsteenIteratorFactory(1), OrderWMSHoofdingRepositoryStub) + #dim GUID As %String = "{7E53DAF1-A44A-49C7-B0D2-4534E9158C9A}" #dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(Request,GUID) Index: AXimpl/Dynamics/InventoryOut/Converter/PickingCompleetConverter.cls.xml =================================================================== diff -u -r50116 -r51833 --- AXimpl/Dynamics/InventoryOut/Converter/PickingCompleetConverter.cls.xml (.../PickingCompleetConverter.cls.xml) (revision 50116) +++ AXimpl/Dynamics/InventoryOut/Converter/PickingCompleetConverter.cls.xml (.../PickingCompleetConverter.cls.xml) (revision 51833) @@ -33,8 +33,18 @@ 1 + +Flow.OrderWMS.HoofdingRepository +1 + + + +AXimpl.Formatter +1 + + -InventoryOutConverter:AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter,DataMOrderApi:DOM.VKP.impl.DataM.DataMOrderAPI,BouwsteenIteratorFactory:AXimpl.Dynamics.InventoryOut.Converter.BouwsteenIteratorFactory +InventoryOutConverter:AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter,DataMOrderApi:DOM.VKP.impl.DataM.DataMOrderAPI,BouwsteenIteratorFactory:AXimpl.Dynamics.InventoryOut.Converter.BouwsteenIteratorFactory,OrderWMSHoofdingRepository:Flow.OrderWMS.HoofdingRepository="",AXimplFormatter:AXimpl.Formatter="" 1 1 %Status @@ -43,6 +53,8 @@ Set ..InventoryOutConverter = $$$Inject(InventoryOutConverter, ##class(AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter).%New()) Set ..DataMOrderApi = $$$Inject(DataMOrderApi, ##class(DOM.DomeinContext).Instance().GeefOrderAPI()) Set ..BouwsteenIteratorFactory = $$$Inject(BouwsteenIteratorFactory,##class(AXimpl.Dynamics.InventoryOut.Converter.BouwsteenIteratorFactory).%New()) + Set ..OrderWMSHoofdingRepository = $$$Inject(OrderWMSHoofdingRepository, ##class(Flow.OrderWMS.HoofdingRepository).%New()) + Set ..AXimplFormatter = $$$Inject(AXimplFormatter, ##class(AXimpl.Formatter).%New()) Set ..IsOngewenstProductFilter = ##class(AX.Uitgaand.PM.impl.IsOngewenstProductInMigratieFilter).%New() @@ -77,6 +89,7 @@ Set Pick.PickId = Bon.GeefID() Set Pick.InventTransId = Lijn.GeefAxInventTransId() Set Pick.Qty = Lijn.GeefAantal() + Set Pick.ShippingDate = ..AXimplFormatter.FormatDate(..OrderWMSHoofdingRepository.GeefViaID(Bon.GeefID()).DueOutTime) If $$$Not(Pick.Qty = 0) { Do ..AxdEntityHeader.Pick.Insert(Pick)