Index: vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator/Test.cls.xml =================================================================== diff -u -r49080 -r55462 --- vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator/Test.cls.xml (.../Test.cls.xml) (revision 49080) +++ vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator/Test.cls.xml (.../Test.cls.xml) (revision 55462) @@ -43,6 +43,11 @@ 1 + +DOM.PM.ProductTypeAPI +1 + + @@ -373,6 +379,9 @@ Set IsStockOverKinderenBepalerStub = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.IsStockOverKinderenBepaler).%New() Do IsStockOverKinderenBepalerStub.IndienMethodCall("IsStockOverKinderen",..#ProductId).DanReturn($$$False) + Set ProductTypeApiStub = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New() + Do ProductTypeApiStub.IndienMethodCall("IsSpaceTowerProduct",..#ProductId).DanReturn($$$False) + #dim Product As Prod.Product = ..GeefTeConverterenProduct() Set StockProduct = ##class(Prod.StockReservatie).%New() Set StockProduct.Product = Product @@ -390,6 +399,7 @@ Set ..AXimplFormatter = AXimplFormatterMock Set ..IsStockOverKinderenBepaler = IsStockOverKinderenBepalerStub Set ..StockFirmaBepaler = ..GeefStockFirmaBepalerStub() + Set ..ProductTypeApi = ProductTypeApiStub #dim InventSyncProduct As AXif.Dynamics.Inventory.MessageParts.AxdEntityInventSync = ..GeefAxInventSyncCreator().MaakInventSync(..#ProductId) @@ -402,6 +412,9 @@ Set IsStockOverKinderenBepalerStub = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.IsStockOverKinderenBepaler).%New() Do IsStockOverKinderenBepalerStub.IndienMethodCall("IsStockOverKinderen",..#ProductId).DanReturn($$$False) + Set ProductTypeApiStub = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New() + Do ProductTypeApiStub.IndienMethodCall("IsSpaceTowerProduct",..#ProductId).DanReturn($$$False) + #dim Product As Prod.Product = ..GeefTeConverterenProduct() Set StockProduct = ##class(Prod.StockReservatie).%New() Set StockProduct.Product = Product @@ -419,6 +432,7 @@ Set ..AXimplFormatter = AXimplFormatterMock Set ..IsStockOverKinderenBepaler = IsStockOverKinderenBepalerStub Set ..StockFirmaBepaler = ..GeefStockFirmaBepalerStub() + Set ..ProductTypeApi = ProductTypeApiStub #dim InventSyncProduct As AXif.Dynamics.Inventory.MessageParts.AxdEntityInventSync = ..GeefAxInventSyncCreator().MaakInventSync(..#ProductId) @@ -431,6 +445,9 @@ Set IsStockOverKinderenBepalerStub = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.IsStockOverKinderenBepaler).%New() Do IsStockOverKinderenBepalerStub.IndienMethodCall("IsStockOverKinderen",..#ProductId).DanReturn($$$True) + Set ProductTypeApiStub = ##class(vhTest.Mock.DOM.PM.ProductTypeAPI).%New() + Do ProductTypeApiStub.IndienMethodCall("IsSpaceTowerProduct",..#ProductId).DanReturn($$$False) + #dim Product As Prod.Product = ..GeefTeConverterenProduct() Set StockProduct = ##class(Prod.StockReservatie).%New() Set StockProduct.Product = Product @@ -449,6 +466,7 @@ Set ..AXimplFormatter = AXimplFormatterMock Set ..IsStockOverKinderenBepaler = IsStockOverKinderenBepalerStub Set ..StockFirmaBepaler = ..GeefStockFirmaBepalerStub() + Set ..ProductTypeApi = ProductTypeApiStub #dim InventSyncProduct As AXif.Dynamics.Inventory.MessageParts.AxdEntityInventSync = ..GeefAxInventSyncCreator().MaakInventSync(..#ProductId) @@ -460,6 +478,45 @@ ]]> + + + + 1 AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator - Index: vhTest/Mock/AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator.cls.xml =================================================================== diff -u -r49092 -r55462 --- vhTest/Mock/AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator.cls.xml (.../AxInventSyncCreator.cls.xml) (revision 49092) +++ vhTest/Mock/AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator.cls.xml (.../AxInventSyncCreator.cls.xml) (revision 55462) @@ -8,6 +8,13 @@ AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator,Tools.Mock.MockClassBase right + +ProductRepository:Prod.ProductRepository="",SequenceNrGenerator:AXimpl.ConfigId="",StockReservatieRepository:Prod.StockReservatieRepository="",ReceptieStockNiveauService:AXimpl.Dynamics.InventoryOut.Converter.ReceptieStockNiveauService="",AXimplFormatter:AXimpl.Formatter="",IsStockOverKinderenBepaler:AXimpl.Dynamics.InventoryOut.Converter.IsStockOverKinderenBepaler="",StockFirmaBepaler:AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator.StockFirmaBepaler="",ProductTypeApi:DOM.PM.ProductTypeAPI="" +%Status + + + PRNr:%String,PRNrSoprPrincipaal:%String="",SoprContractId:%String="",SOPRKindInCache:%String="",AxConfigId:%String="",QtyVHViaSyncAllMaatwerk:%String="",AxMaatwerkGenerischItemId:%String="" AXif.Dynamics.Inventory.MessageParts.AxdEntityInventSync Index: AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator.cls.xml =================================================================== diff -u -r49092 -r55462 --- AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator.cls.xml (.../AxInventSyncCreator.cls.xml) (revision 49092) +++ AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator.cls.xml (.../AxInventSyncCreator.cls.xml) (revision 55462) @@ -38,8 +38,13 @@ 1 + +DOM.PM.ProductTypeAPI +1 + + -ProductRepository:Prod.ProductRepository,SequenceNrGenerator:AXimpl.ConfigId,StockReservatieRepository:Prod.StockReservatieRepository,ReceptieStockNiveauService:AXimpl.Dynamics.InventoryOut.Converter.ReceptieStockNiveauService,AXimplFormatter:AXimpl.Formatter,IsStockOverKinderenBepaler:AXimpl.Dynamics.InventoryOut.Converter.IsStockOverKinderenBepaler,StockFirmaBepaler:AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator.StockFirmaBepaler +ProductRepository:Prod.ProductRepository="",SequenceNrGenerator:AXimpl.ConfigId="",StockReservatieRepository:Prod.StockReservatieRepository="",ReceptieStockNiveauService:AXimpl.Dynamics.InventoryOut.Converter.ReceptieStockNiveauService="",AXimplFormatter:AXimpl.Formatter="",IsStockOverKinderenBepaler:AXimpl.Dynamics.InventoryOut.Converter.IsStockOverKinderenBepaler="",StockFirmaBepaler:AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator.StockFirmaBepaler="",ProductTypeApi:DOM.PM.ProductTypeAPI="" 1 1 %Status @@ -52,6 +57,8 @@ Set ..AXimplFormatter = $$$Inject(AXimplFormatter,##class(AXimpl.Formatter).%New()) Set ..IsStockOverKinderenBepaler = $$$Inject(IsStockOverKinderenBepaler,##class(AXimpl.Dynamics.InventoryOut.Converter.IsStockOverKinderenBepaler).%New()) Set ..StockFirmaBepaler = $$$Inject(StockFirmaBepaler,##class(AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator.StockFirmaBepaler).%New()) + Set ..ProductTypeApi = $$$Inject(ProductTypeApi, ##class(DOM.PM.impl.ProductTypeAPIimpl).%New()) + Quit $$$OK ]]> @@ -74,12 +81,13 @@ #dim StockProduct As Prod.StockReservatie = ..StockReservatieRepository.GeefViaID(PRNr) Set WVStock = StockProduct.WVStock Set FysStock = StockProduct.FysStock - If (..StockFirmaBepaler.BepaalVoorGewoneStock(Product)=##class(DOM.common.enu.InterneFirma).VanHoeckeNv()) { Set FysStock = +FysStock + +WVStock Set WVStock = "" } - } + } ElseIf (..ProductTypeApi.IsSpaceTowerProduct(PRNr)) { + Set FysStock = ##class(APPS.common.StockNiveauServiceFactory).Maak(PRNr).GeefFysischeStockMinReservaties() + } Set InventSyncProduct = ##class(AXif.Dynamics.Inventory.MessageParts.AxdEntityInventSync).%New() Set InventSyncProduct.class = "entity"