Index: vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator/SpaceTowerFysStockBepaler/Test.cls.xml =================================================================== diff -u -r56065 -r56073 --- vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator/SpaceTowerFysStockBepaler/Test.cls.xml (.../Test.cls.xml) (revision 56065) +++ vhUnitTest/AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator/SpaceTowerFysStockBepaler/Test.cls.xml (.../Test.cls.xml) (revision 56073) @@ -53,12 +53,18 @@ 1 + +DOM.PM.ProductTypeAPI +1 + + aTestName:%String @@ -85,32 +91,42 @@ #dim SpaceTowerPRNr As %String = "" #dim AxConfigId As %String = "AxConfigId" + #dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("PRNr", "is geen Spacetowerproduct. FysStock kan niet bepaald worden.") + Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException",Substrings)) + + Do ..ProductTypeApi.IndienMethodCall("IsSpaceTowerProduct", "").DanDoeNiks() + #dim SpaceTowerFysStockBepaler As AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator.SpaceTowerFysStockBepaler = ..GeefSpaceTowerFysStockBepaler() #dim SpaceTowerFysStock As %String = SpaceTowerFysStockBepaler.GeefSpaceTowerFysStock(SpaceTowerPRNr, AxConfigId) - - Do $$$AssertEquals(SpaceTowerFysStock, "0") ]]> - + 1 AXimpl.Dynamics.InventoryOut.Converter.AxInventSyncCreator.SpaceTowerFysStockBepaler - Index: AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator/SpaceTowerFysStockBepaler.cls.xml =================================================================== diff -u -r56059 -r56073 --- AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator/SpaceTowerFysStockBepaler.cls.xml (.../SpaceTowerFysStockBepaler.cls.xml) (revision 56059) +++ AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator/SpaceTowerFysStockBepaler.cls.xml (.../SpaceTowerFysStockBepaler.cls.xml) (revision 56073) @@ -8,14 +8,20 @@ 1 + +DOM.PM.ProductTypeAPI +1 + + -OrderApi:DOM.VKP.OrderAPI="" +OrderApi:DOM.VKP.OrderAPI="",ProductTypeApi:DOM.PM.ProductTypeAPI="" 1 1 %Status 1 @@ -30,19 +36,28 @@ #dim OrderLijn As DOM.VKP.Orderlijn #dim ORDNrNode As %String = "" #dim OLUNrNode As %String = "" + #dim Exception As TECH.Exceptions.Exception - If (($$$HasLength(SpaceTowerPRNr)) && ($$$HasLength(AxConfigId))) { - For { Set ORDNrNode = $Order(^ORD("IP",SpaceTowerPRNr,ORDNrNode)) Quit:ORDNrNode="" - Set Order = ..OrderApi.GeefOrder(ORDNrNode) - If (Order.GeefStatus() = ##class(DOM.VKP.enu.OrderStatus).Gesloten()) { - For { Set OLUNrNode = $Order(^ORD("IP",SpaceTowerPRNr,ORDNrNode,OLUNrNode)) Quit:OLUNrNode="" - Set OrderLijn = Order.GeefOrderLijn(OLUNrNode) - If ((OrderLijn.GeefAxConfigId() = AxConfigId) && (OrderLijn.GeefToeleveringLijnNr()="KOM")) { - Set SpaceTowerFysStock = SpaceTowerFysStock + OrderLijn.GeefAantal() + If (..ProductTypeApi.IsSpaceTowerProduct(SpaceTowerPRNr)) { + If ($$$HasLength(AxConfigId)) { + For { Set ORDNrNode = $Order(^ORD("IP",SpaceTowerPRNr,ORDNrNode)) Quit:ORDNrNode="" + Set Order = ..OrderApi.GeefOrder(ORDNrNode) + If (Order.GeefStatus() = ##class(DOM.VKP.enu.OrderStatus).Gesloten()) { + For { Set OLUNrNode = $Order(^ORD("IP",SpaceTowerPRNr,ORDNrNode,OLUNrNode)) Quit:OLUNrNode="" + Set OrderLijn = Order.GeefOrderLijn(OLUNrNode) + If ((OrderLijn.GeefAxConfigId() = AxConfigId) && (OrderLijn.GeefToeleveringLijnNr()="KOM")) { + Set SpaceTowerFysStock = SpaceTowerFysStock + OrderLijn.GeefAantal() + } } } } + } Else { + Set Exception = ##class(TECH.Exceptions.InvalidInputException).%New("AxConfigId is leeg, maar is noodzakelijk bij een Spacetowerproduct. FysStock kan niet bepaald worden.") + Do ##class(TECH.ExceptionHandler).Throw(Exception) } + } Else { + Set Exception = ##class(TECH.Exceptions.InvalidInputException).%New("PRNr '" _SpaceTowerPRNr _"' is geen Spacetowerproduct. FysStock kan niet bepaald worden.") + Do ##class(TECH.ExceptionHandler).Throw(Exception) } Quit SpaceTowerFysStock Index: vhTest/Mock/AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator/SpaceTowerFysStockBepaler.cls.xml =================================================================== diff -u -r56009 -r56073 --- vhTest/Mock/AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator/SpaceTowerFysStockBepaler.cls.xml (.../SpaceTowerFysStockBepaler.cls.xml) (revision 56009) +++ vhTest/Mock/AXimpl/Dynamics/InventoryOut/Converter/AxInventSyncCreator/SpaceTowerFysStockBepaler.cls.xml (.../SpaceTowerFysStockBepaler.cls.xml) (revision 56073) @@ -9,7 +9,7 @@ right -OrderApi:DOM.VKP.OrderAPI="" +OrderApi:DOM.VKP.OrderAPI="",ProductTypeApi:DOM.PM.ProductTypeAPI="" %Status