Index: vhUnitTest/APPS/Halux/AAP/DnaCodeService/WijzigAantalDnaCodesVoorToeleveringLijn/Test.cls.xml =================================================================== diff -u -r57938 -r60230 --- vhUnitTest/APPS/Halux/AAP/DnaCodeService/WijzigAantalDnaCodesVoorToeleveringLijn/Test.cls.xml (.../Test.cls.xml) (revision 57938) +++ vhUnitTest/APPS/Halux/AAP/DnaCodeService/WijzigAantalDnaCodesVoorToeleveringLijn/Test.cls.xml (.../Test.cls.xml) (revision 60230) @@ -8,6 +8,10 @@ 1 + +DOM.PM.ProductAPI + + aTestName:%String @@ -35,7 +44,7 @@ Set DnaCodeGeneratorStub = ##class(vhTest.Mock.APPS.Halux.AAP.DnaCodeGenerator).%New() Do DnaCodeGeneratorStub.IndienMethodCall("GenereerDnaCode","L").DanReturn("OAAAAA3") - Set DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock, , DnaCodeGeneratorStub) + Set DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock, , DnaCodeGeneratorStub,, ..ProductApiStub) Do DnaCodeService.WijzigAantalDnaCodesVoorToeleveringLijn(ToeleveringLijn) Do DnaCodeRepositoryMock.Verifieer() @@ -55,7 +64,7 @@ Set DnaCodeGeneratorStub = ##class(vhTest.Mock.APPS.Halux.AAP.DnaCodeGenerator).%New() Do DnaCodeGeneratorStub.IndienMethodCall("GenereerDnaCode","L").DanReturn("OAAAAA3") - Set DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock, , DnaCodeGeneratorStub) + Set DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock, , DnaCodeGeneratorStub,, ..ProductApiStub) Do DnaCodeService.WijzigAantalDnaCodesVoorToeleveringLijn(ToeleveringLijn) Do DnaCodeRepositoryMock.Verifieer() @@ -75,7 +84,7 @@ Set DnaCodeGeneratorStub = ##class(vhTest.Mock.APPS.Halux.AAP.DnaCodeGenerator).%New() Do DnaCodeGeneratorStub.IndienMethodCall("GenereerDnaCode","L").DanReturn("OAAAAA3") - Set DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock, , DnaCodeGeneratorStub) + Set DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock, , DnaCodeGeneratorStub,, ..ProductApiStub) Do DnaCodeService.WijzigAantalDnaCodesVoorToeleveringLijn(ToeleveringLijn) Do DnaCodeRepositoryMock.Verifieer() @@ -120,7 +129,7 @@ Set DnaCodeGeneratorStub = ##class(vhTest.Mock.APPS.Halux.AAP.DnaCodeGenerator).%New() Do DnaCodeGeneratorStub.IndienMethodCall("GenereerDnaCode","L").DanReturn("OAAAAA3") - Set DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock, ProductTypeAPIStub, DnaCodeGeneratorStub) + Set DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock, ProductTypeAPIStub, DnaCodeGeneratorStub,, ..ProductApiStub) Do DnaCodeService.WijzigAantalDnaCodesVoorToeleveringLijn(ToeleveringLijn) Do DnaCodeRepositoryMock.Verifieer() @@ -145,7 +154,7 @@ Set DnaCodeGeneratorStub = ##class(vhTest.Mock.APPS.Halux.AAP.DnaCodeGenerator).%New() Do DnaCodeGeneratorStub.IndienMethodCall("GenereerDnaCode","L").DanReturn("OAAAAA3") - Set DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock, ProductTypeAPIStub, DnaCodeGeneratorStub) + Set DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock, ProductTypeAPIStub, DnaCodeGeneratorStub,, ..ProductApiStub) Do DnaCodeService.WijzigAantalDnaCodesVoorToeleveringLijn(ToeleveringLijn) Do DnaCodeRepositoryMock.Verifieer() Index: vhTest/Mock/APPS/Halux/AAP/DnaCodeService.cls.xml =================================================================== diff -u -r60112 -r60230 --- vhTest/Mock/APPS/Halux/AAP/DnaCodeService.cls.xml (.../DnaCodeService.cls.xml) (revision 60112) +++ vhTest/Mock/APPS/Halux/AAP/DnaCodeService.cls.xml (.../DnaCodeService.cls.xml) (revision 60230) @@ -9,7 +9,7 @@ right -DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository="",ProductTypeAPI:DOM.PM.impl.ProductTypeAPIimpl="",DnaCodeGenerator:APPS.Halux.AAP.DnaCodeGenerator="",ProjectSettingsApi:DOM.common.ProjectSettingsAPI="" +DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository="",ProductTypeAPI:DOM.PM.impl.ProductTypeAPIimpl="",DnaCodeGenerator:APPS.Halux.AAP.DnaCodeGenerator="",ProjectSettingsApi:DOM.common.ProjectSettingsAPI="",ProductApi:DOM.PM.ProductAPI="" %Status Index: vhUnitTest/APPS/Halux/AAP/DnaCodeService/MaakDnaCodesVoorBatch/Test.cls.xml =================================================================== diff -u -r60112 -r60230 --- vhUnitTest/APPS/Halux/AAP/DnaCodeService/MaakDnaCodesVoorBatch/Test.cls.xml (.../Test.cls.xml) (revision 60112) +++ vhUnitTest/APPS/Halux/AAP/DnaCodeService/MaakDnaCodesVoorBatch/Test.cls.xml (.../Test.cls.xml) (revision 60230) @@ -24,6 +24,10 @@ APPS.Halux.common.Batch + +DOM.PM.ProductAPI + + aTestName:%String @@ -46,13 +55,14 @@ Do ..Batch.IndienMethodCall("GeefToeleveringIterator").DanReturn(##class(TECH.ListUtils).CreateIteratorOfObjects(Toelevering)) - Set DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New(, ..ProductTypeApiStub, ..DnaCodeGeneratorStub) + Set DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New(, ..ProductTypeApiStub, ..DnaCodeGeneratorStub,, ..ProductApiStub) #dim DnaCodes as %ListOfDataTypes = DnaCodeService.MaakDnaCodesVoorBatch(..Batch) Do $$$AssertEquals(DnaCodes.Count(),1) Do $$$AssertEquals(DnaCodes.GetAt(1).Lijn,..LijnId) Do $$$AssertEquals(DnaCodes.GetAt(1).Status,##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBatch()) Do $$$AssertEquals(DnaCodes.GetAt(1).IsWegwerpPallet,$$$True) + Do $$$AssertEquals(DnaCodes.GetAt(1).LadeCode,"ABCDEF") ]]> @@ -63,7 +73,7 @@ Do ..Batch.IndienMethodCall("GeefToeleveringIterator").DanReturn(##class(TECH.ListUtils).CreateIteratorOfObjects(Toelevering)) - Set DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New(, ..ProductTypeApiStub, ..DnaCodeGeneratorStub) + Set DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New(, ..ProductTypeApiStub, ..DnaCodeGeneratorStub,, ..ProductApiStub) #dim DnaCodes as %ListOfDataTypes = DnaCodeService.MaakDnaCodesVoorBatch(..Batch) Do $$$AssertEquals(DnaCodes.Count(),0) @@ -79,7 +89,7 @@ Do ..DnaCodeGeneratorStub.IndienMethodCall("GenereerDnaCode","L").DanReturn("HAAAAA3") - Set DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New(, ..ProductTypeApiStub, ..DnaCodeGeneratorStub) + Set DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New(, ..ProductTypeApiStub, ..DnaCodeGeneratorStub,, ..ProductApiStub) #dim DnaCodes as %ListOfDataTypes = DnaCodeService.MaakDnaCodesVoorBatch(..Batch) Do $$$AssertEquals(DnaCodes.Count(),2) @@ -97,7 +107,7 @@ Do ..Batch.IndienMethodCall("GeefToeleveringIterator").DanReturn(##class(TECH.ListUtils).CreateIteratorOfObjects(Toelevering1, Toelevering2)) - Set DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New(, ..ProductTypeApiStub, ..DnaCodeGeneratorStub) + Set DnaCodeService = ##class(APPS.Halux.AAP.DnaCodeService).%New(, ..ProductTypeApiStub, ..DnaCodeGeneratorStub,, ..ProductApiStub) #dim DnaCodes as %ListOfDataTypes = DnaCodeService.MaakDnaCodesVoorBatch(..Batch) Do $$$AssertEquals(DnaCodes.Count(),2) Index: APPS/Halux/AAP/DnaCodeService.cls.xml =================================================================== diff -u -r60113 -r60230 --- APPS/Halux/AAP/DnaCodeService.cls.xml (.../DnaCodeService.cls.xml) (revision 60113) +++ APPS/Halux/AAP/DnaCodeService.cls.xml (.../DnaCodeService.cls.xml) (revision 60230) @@ -25,8 +25,13 @@ 1 + +DOM.PM.ProductAPI +1 + + -DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository="",ProductTypeAPI:DOM.PM.impl.ProductTypeAPIimpl="",DnaCodeGenerator:APPS.Halux.AAP.DnaCodeGenerator="",ProjectSettingsApi:DOM.common.ProjectSettingsAPI="" +DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository="",ProductTypeAPI:DOM.PM.impl.ProductTypeAPIimpl="",DnaCodeGenerator:APPS.Halux.AAP.DnaCodeGenerator="",ProjectSettingsApi:DOM.common.ProjectSettingsAPI="",ProductApi:DOM.PM.ProductAPI="" 1 1 %Status @@ -37,6 +42,7 @@ Set ..DnaCodeGenerator = $$$Inject(DnaCodeGenerator, ##class(APPS.Halux.AAP.DnaCodeGenerator).%New()) Set ..ProjectSettingsApi = $$$Inject(ProjectSettingsApi, ##class(DOM.common.impl.ProjectSettingsAPI).%New()) Set ..DateTimeApi = ##class(TECH.Context).Instance().GeefDateTimeAPI() + Set ..ProductApi = $$$Inject(ProductApi, ##class(DOM.PM.impl.ProductAPI).%New()) Quit $$$OK ]]> @@ -166,6 +172,7 @@ Set DnaCode.ToeleveringLijn = ToeleveringLijn.GeefID() Set DnaCode.OrderId = ToeleveringLijn.GeefOrderID() Set DnaCode.AanmaakTijdstip = ##class(TECH.Context).Instance().GeefDateTimeAPI().CurrentHorolog() + Set DnaCode.LadeCode = ..ProductApi.GeefProduct(ProductID).GeefLadeCode() If $IsObject(Batch) { Set DnaCode.BatchId = Batch.GeefID() Set DnaCode.IsWegwerpPallet = Batch.GeefIsWegwerpPallet() Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml =================================================================== diff -u -r60176 -r60230 --- WSimpl/Halux/AAP/DnaCodeService.cls.xml (.../DnaCodeService.cls.xml) (revision 60176) +++ WSimpl/Halux/AAP/DnaCodeService.cls.xml (.../DnaCodeService.cls.xml) (revision 60230) @@ -338,7 +338,7 @@ Do ..DnaCodeRepository.Bewaar(DnaCode) } - Do ##class(BL.MB.UGLYPicking.Receptie).CloseAndHandleBuffer("~tmp",VolgNr) + //Do ##class(BL.MB.UGLYPicking.Receptie).CloseAndHandleBuffer("~tmp",VolgNr) } }