Index: APPS/EDI/Bestel/impl/BestelService/UnishopBesteller.cls.xml =================================================================== diff -u -r36377 -r36620 --- APPS/EDI/Bestel/impl/BestelService/UnishopBesteller.cls.xml (.../UnishopBesteller.cls.xml) (revision 36377) +++ APPS/EDI/Bestel/impl/BestelService/UnishopBesteller.cls.xml (.../UnishopBesteller.cls.xml) (revision 36620) @@ -122,10 +122,23 @@ Set Iterator = ##class(TECH.ListIterator).%New(Order.Lijnen) #dim FilterIterator As TECH.Iterator = ##class(TECH.DynamicIterator).%New(Iterator,,Filter) + #dim ProbleemLijnen As %String = "" while FilterIterator.HasNext() { - do ..VoegToeLijn(OfferteID,FilterIterator.Next()) + try { + do ..VoegToeLijn(OfferteID,FilterIterator.Next()) + } catch { + #dim GecatchteException As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch() + Set ProbleemLijnen = ProbleemLijnen _ " " _ FilterIterator.Key() + } + If $$$HasLength(ProbleemLijnen) { + Set Exception = ##class(TECH.Exceptions.InvalidInputException).%New("Ongeldige data UNIShopBesteller op lijn(en) "_ProbleemLijnen) + Do Exception.VoegToeInnerExceptie(GecatchteException) + } } + If $$$HasLength(ProbleemLijnen) { + Do ##class(TECH.ExceptionHandler).Throw(Exception) + } ]]> Index: APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/ProductlijnToevoeger.cls.xml =================================================================== diff -u -r36539 -r36620 --- APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/ProductlijnToevoeger.cls.xml (.../ProductlijnToevoeger.cls.xml) (revision 36539) +++ APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/ProductlijnToevoeger.cls.xml (.../ProductlijnToevoeger.cls.xml) (revision 36620) @@ -47,18 +47,20 @@ Set Exceptions = ##class(TECH.ExceptionList).%New() #dim ExceptionsSmijten As %Boolean = $$$False + #dim ProbleemLijnen As %String = "" While FilterIterator.HasNext() { #dim Lijn As APPS.EDI.common.dto.ProductLijn = FilterIterator.Next() If ..ProductValidator.IsValid(Lijn.Product, .Exceptions) { Do ..VoegToeLijn(Lijn) } Else { + Set ProbleemLijnen = ProbleemLijnen _ " " _ FilterIterator.Key() Set ExceptionsSmijten = $$$True } } If ExceptionsSmijten { - Set Exception = ##class(TECH.Exceptions.InvalidInputException).%New("Ongeldige data") + Set Exception = ##class(TECH.Exceptions.InvalidInputException).%New("Ongeldige data TandemboxBesteller op lijn(en) "_ProbleemLijnen) Do Exception.ZetInnerExcepties(Exceptions) Do ##class(TECH.ExceptionHandler).Throw(Exception) } Index: vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/ProductlijnToevoeger/Test.cls.xml =================================================================== diff -u -r36528 -r36620 --- vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/ProductlijnToevoeger/Test.cls.xml (.../Test.cls.xml) (revision 36528) +++ vhUnitTest/APPS/EDI/Bestel/impl/BestelService/TandemboxBesteller/ProductlijnToevoeger/Test.cls.xml (.../Test.cls.xml) (revision 36620) @@ -194,6 +194,25 @@ ]]> + + + + 1 APPS.EDI.Bestel.BestelService.PlaatsBestelling.Aanvraag Index: vhUnitTest/APPS/EDI/Bestel/impl/BestelService/UnishopBesteller/PlaatsBestelling/Test.cls.xml =================================================================== diff -u -r36453 -r36620 --- vhUnitTest/APPS/EDI/Bestel/impl/BestelService/UnishopBesteller/PlaatsBestelling/Test.cls.xml (.../Test.cls.xml) (revision 36453) +++ vhUnitTest/APPS/EDI/Bestel/impl/BestelService/UnishopBesteller/PlaatsBestelling/Test.cls.xml (.../Test.cls.xml) (revision 36620) @@ -322,6 +322,32 @@ ]]> + + + + 1