Index: vhTestFiles/UnitTests/AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter/Test/Testafhandelingindiennietgelockedkanworden/Journaal1lijn.xml =================================================================== diff -u --- vhTestFiles/UnitTests/AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter/Test/Testafhandelingindiennietgelockedkanworden/Journaal1lijn.xml (revision 0) +++ vhTestFiles/UnitTests/AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter/Test/Testafhandelingindiennietgelockedkanworden/Journaal1lijn.xml (revision 50948) @@ -0,0 +1,15 @@ + + + 500001 + vhbe + PackingSlipId + + 1234 + Purch + Identnummer + 1 + 25 + + + + Index: vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter/TestHalux.cls.xml =================================================================== diff -u -r49526 -r50948 --- vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter/TestHalux.cls.xml (.../TestHalux.cls.xml) (revision 49526) +++ vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter/TestHalux.cls.xml (.../TestHalux.cls.xml) (revision 50948) @@ -38,7 +38,9 @@ Set FLOWTOEMock = ##class(vhTest.Mock.BL.Legacy.FLOWTOE).%New() Do FLOWTOEMock.VerwachtMethodCall("SWNode","L||6628","1","101").DanDoeNiks() - Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverter,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock) + #dim ProductLockerMock as vhTest.Mock.AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker = ..GeefProductLockerMock() + Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverter,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock,ProductLockerMock) + #dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..GeefJournal(),"MessageID") Do $$$AssertEquals(Response,Antwoord) @@ -61,17 +63,37 @@ Set InventoryOutConverter = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter).%New() Set ProductRepositoryMock = ##class(vhTest.Mock.Prod.ProductRepository).%New() - #dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Nieuwe leverancier met id '01234' gedefinieerd in AX Halux, die nog niet voorzien is in Admin Conversiecode.") - do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException",Substrings)) + ;#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Nieuwe leverancier met id '01234' gedefinieerd in AX Halux, die nog niet voorzien is in Admin Conversiecode.") + ;do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException",Substrings)) Set BezwarenBepalerMock = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryIn.Converter.ConversieBezwarenBepaler).%New() Do BezwarenBepalerMock.IndienMethodCall("GeefBezwaren",$$$ElkeWaarde).DanReturn(##class(%ListOfDataTypes).%New()) - - Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverter,ProductRepositoryMock,,,BezwarenBepalerMock) + + Set Exception = ##class(TECH.Exceptions.InvalidInputException).%New("Nieuwe leverancier met id '01234' gedefinieerd in AX Halux, die nog niet voorzien is in Admin Conversiecode.") + Set ProductLockerMock = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker).%New() + Do ProductLockerMock.IndienMethodCall("BepaalTeLockenProducten",$$$ElkeWaarde).DanException(Exception) + Do ProductLockerMock.VerwachtMethodCall("HeeftTeLockenProducten").DanReturn($$$False) + + Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverter,ProductRepositoryMock,,,BezwarenBepalerMock,,ProductLockerMock) #dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..GeefJournal(),"MessageID") + Do ProductLockerMock.Verifieer() + Do $$$AssertEquals(Response.MessagePart.Header.GetAt(1).ErrorText,"Ontvangstjournaal bevat geen producten om te verwerken of fout tijdens bepaling te locken producten.") ]]> + +1 +vhTest.Mock.AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker + + + 1 AXif.Dynamics.InventoryIn.MessageParts.AxdADUMsgWMSJournalOut Index: vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter/TestTerugname.cls.xml =================================================================== diff -u -r50807 -r50948 --- vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter/TestTerugname.cls.xml (.../TestTerugname.cls.xml) (revision 50807) +++ vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter/TestTerugname.cls.xml (.../TestTerugname.cls.xml) (revision 50948) @@ -42,7 +42,9 @@ Set FLOWTOEMock = ##class(vhTest.Mock.BL.Legacy.FLOWTOE).%New() Do FLOWTOEMock.VerwachtMethodCall("SWNode","L||6051","1","101").DanDoeNiks() - Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverter,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock) + #dim ProductLockerMock as vhTest.Mock.AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker = ..GeefProductLockerMock() + + Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverter,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock,ProductLockerMock) #dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..GeefJournal(),"MessageID") Do $$$AssertEquals(Response,Antwoord) @@ -101,8 +103,10 @@ Set FLOWTOEMock = ##class(vhTest.Mock.BL.Legacy.FLOWTOE).%New() Do FLOWTOEMock.VerwachtMethodCall("SWNode","L||6051","1","101").DanDoeNiks().ExactAantalKeer(2) - Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverter,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock) + #dim ProductLockerMock as vhTest.Mock.AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker = ..GeefProductLockerMock() + Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverter,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock,ProductLockerMock) + #dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..GeefJournal(),"MessageID") Do $$$AssertEquals(Response,Antwoord) @@ -171,7 +175,9 @@ Set FLOWTOEMock = ##class(vhTest.Mock.BL.Legacy.FLOWTOE).%New() Do FLOWTOEMock.VerwachtMethodCall("SWNode","L||6051","1","101").DanDoeNiks() - Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverterStub,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock) + #dim ProductLockerMock as vhTest.Mock.AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker = ..GeefProductLockerMock() + + Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverterStub,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock,ProductLockerMock) #dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..GeefJournal(),"MessageID") Do $$$AssertEquals(Response,Antwoord) @@ -185,6 +191,19 @@ ]]> + +1 +vhTest.Mock.AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker + + + 1 AXif.Dynamics.InventoryIn.MessageParts.AxdADUMsgWMSJournalOut Index: vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter/TestBlum.cls.xml =================================================================== diff -u -r49459 -r50948 --- vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter/TestBlum.cls.xml (.../TestBlum.cls.xml) (revision 49459) +++ vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter/TestBlum.cls.xml (.../TestBlum.cls.xml) (revision 50948) @@ -40,7 +40,9 @@ Set FLOWTOEMock = ##class(vhTest.Mock.BL.Legacy.FLOWTOE).%New() Do FLOWTOEMock.VerwachtMethodCall("SWNode","L||5005","1","101").DanDoeNiks() - Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverter,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock) + #dim ProductLockerMock as vhTest.Mock.AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker = ..GeefProductLockerMock() + + Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverter,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock,ProductLockerMock) #dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..GeefJournal(),"MessageID") Do $$$AssertEquals(Response,Antwoord) @@ -91,8 +93,10 @@ Set FLOWTOEMock = ##class(vhTest.Mock.BL.Legacy.FLOWTOE).%New() Do FLOWTOEMock.VerwachtMethodCall("SWNode","L||5005","1","101").DanDoeNiks() + + #dim ProductLockerMock as vhTest.Mock.AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker = ..GeefProductLockerMock() - Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverter,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock) + Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverter,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock,ProductLockerMock) #dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..GeefJournal(),"MessageID") Do ToeleveringAPIMock.Verifieer() @@ -145,7 +149,9 @@ Set FLOWTOEMock = ##class(vhTest.Mock.BL.Legacy.FLOWTOE).%New() Do FLOWTOEMock.VerwachtMethodCall("SWNode","L||5005","1","101").DanDoeNiks() - Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverter,ProductRepositoryMock,,,BezwarenBepalerMock, FLOWTOEMock) + #dim ProductLockerMock as vhTest.Mock.AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker = ..GeefProductLockerMock() + + Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverter,ProductRepositoryMock,,,BezwarenBepalerMock, FLOWTOEMock,ProductLockerMock) #dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..GeefJournal(),"MessageID") Do ToeleveringAPIMock.Verifieer() @@ -198,7 +204,9 @@ Set FLOWTOEMock = ##class(vhTest.Mock.BL.Legacy.FLOWTOE).%New() Do FLOWTOEMock.VerwachtMethodCall("SWNode","L||5002","1","101").DanDoeNiks() - Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverter,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock) + #dim ProductLockerMock as vhTest.Mock.AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker = ..GeefProductLockerMock() + + Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverter,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock,ProductLockerMock) #dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..GeefJournal(),"MessageID") Do ToeleveringAPIMock.Verifieer() @@ -251,7 +259,9 @@ Set FLOWTOEMock = ##class(vhTest.Mock.BL.Legacy.FLOWTOE).%New() Do FLOWTOEMock.VerwachtMethodCall("SWNode","L||5005","1","101").DanDoeNiks() - Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverter,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock) + #dim ProductLockerMock as vhTest.Mock.AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker = ..GeefProductLockerMock() + + Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverter,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock,ProductLockerMock) #dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..GeefJournal(),"MessageID") Do ToeleveringAPIMock.Verifieer() @@ -266,6 +276,19 @@ ]]> + +1 +vhTest.Mock.AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker + + + 1 AXif.Dynamics.InventoryIn.MessageParts.AxdADUMsgWMSJournalOut Index: vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter/Test.cls.xml =================================================================== diff -u -r50807 -r50948 --- vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter/Test.cls.xml (.../Test.cls.xml) (revision 50807) +++ vhUnitTest/AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter/Test.cls.xml (.../Test.cls.xml) (revision 50948) @@ -3,7 +3,7 @@ vhUnitTest.AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter.Base - + @@ -80,8 +88,10 @@ Set FLOWTOEMock = ##class(vhTest.Mock.BL.Legacy.FLOWTOE).%New() Do FLOWTOEMock.VerwachtMethodCall("SWNode","L||1234","1","101").DanDoeNiks() - Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverter,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock) + #dim ProductLockerMock as vhTest.Mock.AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker = ..GeefProductLockerMock() + Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverter,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock,ProductLockerMock) + #dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..GeefJournal(),"MessageID") Do $$$AssertEquals(Response,Antwoord) @@ -130,8 +140,10 @@ Set FLOWTOEMock = ##class(vhTest.Mock.BL.Legacy.FLOWTOE).%New() Do FLOWTOEMock.VerwachtMethodCall("SWNode","L||1234","1","101").DanDoeNiks() - - Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverter,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock) + + #dim ProductLockerMock as vhTest.Mock.AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker = ..GeefProductLockerMock() + + Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverter,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock,ProductLockerMock) #dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..GeefJournal(),"MessageID") Do $$$AssertEquals(Response,Antwoord) @@ -187,7 +199,9 @@ Set FLOWTOEMock = ##class(vhTest.Mock.BL.Legacy.FLOWTOE).%New() Do FLOWTOEMock.VerwachtMethodCall("SWNode","L||1234","1","101").DanDoeNiks() - Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverterStub,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock) + #dim ProductLockerMock as vhTest.Mock.AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker = ..GeefProductLockerMock() + + Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverterStub,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock,ProductLockerMock) #dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..GeefJournal2LijnenZelfdeLeverancier(),"MessageID") Do $$$AssertEquals(Response,Antwoord) @@ -238,7 +252,9 @@ Set FLOWTOEMock = ##class(vhTest.Mock.BL.Legacy.FLOWTOE).%New() Do FLOWTOEMock.VerwachtMethodCall("SWNode","L||1234","1","101").DanDoeNiks() - Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverterStub,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock) + #dim ProductLockerMock as vhTest.Mock.AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker = ..GeefProductLockerMock() + + Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverterStub,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock,ProductLockerMock) #dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..GeefJournal2LijnenZelfdeLeverancierZelfdeProduct(),"MessageID") Do $$$AssertEquals(Response,Antwoord) @@ -300,7 +316,9 @@ Do FLOWTOEMock.VerwachtMethodCall("SWNode","L||1234","1","101").DanDoeNiks() Do FLOWTOEMock.VerwachtMethodCall("SWNode","L||5678","1","101").DanDoeNiks() - Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverterStub,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock) + #dim ProductLockerMock as vhTest.Mock.AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker = ..GeefProductLockerMock() + + Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverterStub,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock,ProductLockerMock) #dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..GeefJournal2LijnenVerschillendeLeverancier(),"MessageID") Do $$$AssertEquals(Response,Antwoord) @@ -393,7 +411,9 @@ Set FLOWTOEMock = ##class(vhTest.Mock.BL.Legacy.FLOWTOE).%New() Do FLOWTOEMock.VerwachtMethodCall("SWNode","L||1234","1","101").DanDoeNiks() - Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverterStub,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock) + #dim ProductLockerMock as vhTest.Mock.AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker = ..GeefProductLockerMock() + + Set Converter = ##class(AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New(ToeleveringAPIMock,ProductLookupMock,ReceptieServiceMock,InventoryOutConverterStub,ProductRepositoryMock,,,BezwarenBepalerMock,FLOWTOEMock,ProductLockerMock) #dim Response As AXif.Dynamics.Inventory.MessageParts = Converter.Convert(..GeefJournal(),"MessageID") Do $$$AssertEquals(Response,Antwoord) @@ -407,6 +427,49 @@ ]]> + + + + + +1 +vhTest.Mock.AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker + + + 1 AXif.Dynamics.InventoryIn.MessageParts.AxdADUMsgWMSJournalOut Index: AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter.cls.xml =================================================================== diff -u -r50807 -r50948 --- AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter.cls.xml (.../InventoryInConverter.cls.xml) (revision 50807) +++ AXimpl/Dynamics/InventoryIn/Converter/InventoryInConverter.cls.xml (.../InventoryInConverter.cls.xml) (revision 50948) @@ -81,8 +81,13 @@ 1 + +AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker +1 + + -ToeleveringAPI:DOM.AKP.ToeleveringAPI,ProductLookup:AXimpl.Admin.Common.ProductBepaler,ReceptieService:APPS.AKP.Receptie.impl.ReceptieService,InventoryOutConverter:AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter,ProductRepository:Prod.ProductRepository,AankoopAPI:DOM.AKP.AankoopAPI,ProductTypeAPI:DOM.PM.ProductTypeAPI,ConversieBezwarenBepaler:AXimpl.Dynamics.InventoryIn.Converter.ConversieBezwarenBepaler,FLOWTOE:BL.Legacy.FLOWTOE +ToeleveringAPI:DOM.AKP.ToeleveringAPI,ProductLookup:AXimpl.Admin.Common.ProductBepaler,ReceptieService:APPS.AKP.Receptie.impl.ReceptieService,InventoryOutConverter:AXimpl.Dynamics.InventoryOut.Converter.InventoryOutConverter,ProductRepository:Prod.ProductRepository,AankoopAPI:DOM.AKP.AankoopAPI,ProductTypeAPI:DOM.PM.ProductTypeAPI,ConversieBezwarenBepaler:AXimpl.Dynamics.InventoryIn.Converter.ConversieBezwarenBepaler,FLOWTOE:BL.Legacy.FLOWTOE,ProductLocker:AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker 1 1 %Status @@ -99,6 +104,8 @@ Set ..ConversieBezwarenBepaler = $$$Inject(ConversieBezwarenBepaler,##class(AXimpl.Dynamics.InventoryIn.Converter.ConversieBezwarenBepaler).%New()) Set ..FLOWTOE = $$$Inject(FLOWTOE,##class(BL.Legacy.FLOWTOE).%New()) Set ..Logger = ##class(vhLib.Logger).%New() + Set ..ProductLocker = $$$Inject(ProductLocker,##class(AXimpl.Dynamics.InventoryIn.Converter.TeOntvangenProductLocker).%New()) + Quit $$$OK ]]> @@ -110,15 +117,40 @@ Do ..Logger.Info("ReceiveInventory IN", "Begin verwerken journaal " _ WMSJournalOutRequest.JournalTable.GetAt(1).JournalId) #dim VerwerkingBezwaren as %String = ##class(TECH.ListUtils).ListToPieces(..ConversieBezwarenBepaler.GeefBezwaren(WMSJournalOutRequest),$$$CRLF) Quit:$Length(VerwerkingBezwaren) ..GeefFoutResponse(VerwerkingBezwaren,MessageId) - - Set ..ToeleveringMetReceptieArray = ##class(%ArrayOfDataTypes).%New() - Set ..ToeleveringZonderReceptieArray = ##class(%ArrayOfDataTypes).%New() - Set ..AangemaakteRecepties = ##class(%ListOfDataTypes).%New() - - Do ..MaakToeleveringen(WMSJournalOutRequest) - Do ..MaakRecepties(WMSJournalOutRequest.JournalTable.GetAt(1).JournalId,WMSJournalOutRequest.JournalTable.GetAt(1).PackingSlipId) - Quit ..GeefResponse(WMSJournalOutRequest,MessageId) + try { + Do ..ProductLocker.BepaalTeLockenProducten(WMSJournalOutRequest) + } catch { + #dim ProductBepalingException As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch() + Set Response = ..GeefFoutResponse("Fout tijdens bepaling welke producten te locken in Admin."_$$$CRLF_ ProductBepalingException.GeefOmschrijving(),MessageId) + } + + If ..ProductLocker.HeeftTeLockenProducten(){ + If ..ProductLocker.LockProducten(){ + try { + Set ..ToeleveringMetReceptieArray = ##class(%ArrayOfDataTypes).%New() + Set ..ToeleveringZonderReceptieArray = ##class(%ArrayOfDataTypes).%New() + Set ..AangemaakteRecepties = ##class(%ListOfDataTypes).%New() + + Do ..MaakToeleveringen(WMSJournalOutRequest) + Do ..MaakRecepties(WMSJournalOutRequest.JournalTable.GetAt(1).JournalId,WMSJournalOutRequest.JournalTable.GetAt(1).PackingSlipId) + + #dim Response as AXif.Dynamics.Inventory.MessageParts + set Response = ..GeefResponse(WMSJournalOutRequest,MessageId) + } catch { + #dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch() + Do ..Logger.Error("ReceiveInventory IN","Fout tijdens verwerking ontvangstjournaal" _$$$CRLF_ Exception.GeefOmschrijving()) + Set Response = ..GeefFoutResponse("Fout tijdens verwerking van ontvangstjournaal in Admin." _ $$$CRLF _ Exception.GeefOmschrijving(),MessageId) + } + Do ..ProductLocker.UnlockProducten() + } else { + ; kan niet alle producten locken van bericht + set Response = ..GeefFoutResponse("Kon minstens één te ontvangen product niet locken in Admin. Probeer later opnieuw",MessageId) + } + } else { + Set Response = ..GeefFoutResponse("Ontvangstjournaal bevat geen producten om te verwerken of fout tijdens bepaling te locken producten.",MessageId) + } + Quit Response ]]> @@ -209,7 +241,6 @@ Do Toelevering.ZetBestelBevestigingNr(JournalEntry.JournalId) - Quit Toelevering ]]>