Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r63644 -r63660
--- WSimpl/Halux/AAP/DnaCodeService.cls.xml (.../DnaCodeService.cls.xml) (revision 63644)
+++ WSimpl/Halux/AAP/DnaCodeService.cls.xml (.../DnaCodeService.cls.xml) (revision 63660)
@@ -73,8 +73,13 @@
1
+
+DOM.AKP.ToeleveringService
+1
+
+
-DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository="",PalletCodeValidator:WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator="",InventarisService:APPS.MAG.Inventaris.impl.InventarisService,DocsV1:BL.PPS.TBX.DocsV1="",KlantinstellingenRepository:DOM.Halux.AAP.KlantinstellingenRepository="",VerkoopAPI:DOM.VKP.VerkoopAPI="",AantalGescandeVhossSequentieItemsBepaler:WSimpl.Halux.AAP.DnaCodeService.AantalGescandeVhossSequentieItemsBepaler="",DnaCodeInVhossKastBepaler:WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler="",SequentieService:APPS.Halux.common.impl.SequentieService="",RondAfVhossKastHelper:WSimpl.Halux.AAP.DnaCodeService.RondAfVhossKastHelper=""
+DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository="",PalletCodeValidator:WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator="",InventarisService:APPS.MAG.Inventaris.impl.InventarisService,DocsV1:BL.PPS.TBX.DocsV1="",KlantinstellingenRepository:DOM.Halux.AAP.KlantinstellingenRepository="",VerkoopAPI:DOM.VKP.VerkoopAPI="",AantalGescandeVhossSequentieItemsBepaler:WSimpl.Halux.AAP.DnaCodeService.AantalGescandeVhossSequentieItemsBepaler="",DnaCodeInVhossKastBepaler:WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler="",SequentieService:APPS.Halux.common.impl.SequentieService="",RondAfVhossKastHelper:WSimpl.Halux.AAP.DnaCodeService.RondAfVhossKastHelper="",ToeleveringService:DOM.AKP.ToeleveringService=""
1
1
%Status
@@ -92,6 +97,7 @@
Set ..VerzendDirectControleur = ##class(BL.MB.UGLYPicking.VerzendDirectControleur).%New()
Set ..SequentieService = $$$Inject(SequentieService,##class(APPS.Halux.common.impl.SequentieService).%New())
Set ..RondAfVhossKastHelper = $$$Inject(RondAfVhossKastHelper,##class(WSimpl.Halux.AAP.DnaCodeService.RondAfVhossKastHelper).%New())
+ Set ..ToeleveringService = $$$Inject(ToeleveringService, ##class(DOM.AKP.impl.ToeleveringService).%New())
Set ..BufferHelper = ##class(WSimpl.Halux.AAP.DnaCodeService.BufferHelper).%New()
Quit $$$OK
@@ -363,8 +369,6 @@
Do ..DnaCodeRepository.Bewaar(DnaCode)
-
-
If ..IsGeldigeVhossCode(DnaCodeAfmeldenRequest.PalletCode) {
Set Response = ..AantalGescandeVhossSequentieItemsBepaler.BepaalAantalGescandeVhossSequentieItems(DnaCode)
Set Response.Header.Status = "200"
@@ -389,6 +393,11 @@
Set Response.AantalInToelevering = AantalInToelevering
Set Response.AantalReedsGescand = AantalReedsGescand
}
+
+ Set ToeleveringId = DnaCode.Toelevering
+ If $$$Not(ToeleveringId = "") {
+ Set Response.IsSST = ..ToeleveringService.HeeftToeleveringMinstensEenSpaceStep(ToeleveringId)
+ }
}
}
Index: vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml
===================================================================
diff -u -r62906 -r63660
--- vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml (.../Test.cls.xml) (revision 62906)
+++ vhUnitTest/WSimpl/Halux/AAP/DnaCodeService/DnaCodeAfmelden/Test.cls.xml (.../Test.cls.xml) (revision 63660)
@@ -20,8 +20,11 @@
Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaToeleveringIdEnRecent",DnaCode1.Toelevering).DanReturn(DnaCodeIteratorTweeStuks)
Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",DnaCode1).ExactAantalKeer(1)
- Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
+ Set ToeleveringServiceMock = ##class(vhTest.Mock.DOM.AKP.ToeleveringService).%New()
+ Do ToeleveringServiceMock.VerwachtMethodCall("HeeftToeleveringMinstensEenSpaceStep",DnaCode1.Toelevering).DanDoeNiks()
+ Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock)
+
#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
Do $$$AssertEquals(Antwoord.Header.Status,"200")
@@ -30,6 +33,7 @@
Do $$$AssertEquals(Antwoord.AantalReedsGescand,"1")
Do $$$AssertEquals(Antwoord.DnaCodes.GetAt(1).Locatie,##class(APPS.MAG.enu.MagazijnTransitLocatie).Halux2Transit())
Do DnaCodeRepositoryMock.Verifieer()
+ Do ToeleveringServiceMock.Verifieer()
]]>
@@ -71,8 +75,11 @@
Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaToeleveringIdEnRecent",DnaCode1.Toelevering).DanReturn(..EmptyIterator())
Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",DnaCode1).ExactAantalKeer(1)
- Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
+ Set ToeleveringServiceMock = ##class(vhTest.Mock.DOM.AKP.ToeleveringService).%New()
+ Do ToeleveringServiceMock.VerwachtMethodCall("HeeftToeleveringMinstensEenSpaceStep", DnaCode2.Toelevering).DanDoeNiks()
+ Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock)
+
#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
Do $$$AssertEquals(Antwoord.Header.Status,"-1021")
@@ -81,6 +88,7 @@
Do $$$AssertEquals(Antwoord.AantalInToelevering,"0")
Do $$$AssertEquals(Antwoord.AantalReedsGescand,"0")
Do DnaCodeRepositoryMock.Verifieer()
+ Do ToeleveringServiceMock.Verifieer()
]]>
@@ -157,15 +165,19 @@
Set DnaCodeInVhossKastBepalerStub = ##class(vhTest.Mock.WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler).%New()
Do DnaCodeInVhossKastBepalerStub.IndienMethodCall("MagDnaCodeInVhossKast", DnaCode1, Request.PalletCode, Request.BatchId).DanReturn(1)
- Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,DnaCodeInVhossKastBepalerStub)
+ Set ToeleveringServiceMock = ##class(vhTest.Mock.DOM.AKP.ToeleveringService).%New()
+ Do ToeleveringServiceMock.VerwachtMethodCall("HeeftToeleveringMinstensEenSpaceStep",DnaCode1.Toelevering).DanDoeNiks()
+ Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,, DnaCodeInVhossKastBepalerStub,,, ToeleveringServiceMock)
+
#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
Do $$$AssertEquals(Antwoord.Header.Status,"200")
Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
Do $$$AssertEquals(Antwoord.AantalInToelevering,"0")
Do $$$AssertEquals(Antwoord.AantalReedsGescand,"0")
Do DnaCodeRepositoryMock.Verifieer()
+ Do ToeleveringServiceMock.Verifieer()
]]>
@@ -248,15 +260,19 @@
Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaToeleveringIdEnRecent",DnaCode1.Toelevering).DanReturn(DnaCodeIteratorTweeStuks)
Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",DnaCode1).ExactAantalKeer(1)
- Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
+ Set ToeleveringServiceMock = ##class(vhTest.Mock.DOM.AKP.ToeleveringService).%New()
+ Do ToeleveringServiceMock.VerwachtMethodCall("HeeftToeleveringMinstensEenSpaceStep", DnaCode2.Toelevering).DanDoeNiks()
+ Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock)
+
#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
Do $$$AssertEquals(Antwoord.Header.Status,"200")
Do $$$AssertEquals(Antwoord.DnaCodes.Count(),2)
Do $$$AssertEquals(Antwoord.AantalInToelevering,"2")
Do $$$AssertEquals(Antwoord.AantalReedsGescand,"0")
Do DnaCodeRepositoryMock.Verifieer()
+ Do ToeleveringServiceMock.Verifieer()
]]>
@@ -345,15 +361,19 @@
Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaToeleveringIdEnRecent",DnaCode1.Toelevering).DanReturn(DnaCodeIteratorTweeStuks)
Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",..Matches.Object(AfgemeldeDnaCode)).ExactAantalKeer(1)
- Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
+ Set ToeleveringServiceMock = ##class(vhTest.Mock.DOM.AKP.ToeleveringService).%New()
+ Do ToeleveringServiceMock.VerwachtMethodCall("HeeftToeleveringMinstensEenSpaceStep",AfgemeldeDnaCode.Toelevering).DanDoeNiks()
+ Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock)
+
#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
Do $$$AssertEquals(Antwoord.Header.Status,"200")
Do $$$AssertEquals(Antwoord.DnaCodes.Count(),2)
Do $$$AssertEquals(Antwoord.AantalInToelevering,"2")
Do $$$AssertEquals(Antwoord.AantalReedsGescand,"1")
Do DnaCodeRepositoryMock.Verifieer()
+ Do ToeleveringServiceMock.Verifieer()
]]>
@@ -371,14 +391,18 @@
Do DnaCodeRepositoryMock.IndienMethodCall("ZoekViaToeleveringIdEnRecent",DnaCode1.Toelevering).DanReturn(DnaCodeIteratorEenStuk)
Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",DnaCode1).ExactAantalKeer(1)
- Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
+ Set ToeleveringServiceMock = ##class(vhTest.Mock.DOM.AKP.ToeleveringService).%New()
+ Do ToeleveringServiceMock.VerwachtMethodCall("HeeftToeleveringMinstensEenSpaceStep",DnaCode1.Toelevering).DanDoeNiks()
+ Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock)
+
#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
Do $$$AssertEquals(Antwoord.Header.Status,"200")
Do $$$AssertEquals(Antwoord.DnaCodes.Count(),1)
Do $$$AssertEquals(Antwoord.DnaCodes.GetAt(1).Locatie,$$$DummyString)
Do DnaCodeRepositoryMock.Verifieer()
+ Do ToeleveringServiceMock.Verifieer()
]]>
@@ -410,14 +434,18 @@
Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",DnaCode2).ExactAantalKeer(1)
Do DnaCodeRepositoryMock.VerwachtMethodCall("Bewaar",DnaCode3).ExactAantalKeer(1)
- Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock)
+ Set ToeleveringServiceMock = ##class(vhTest.Mock.DOM.AKP.ToeleveringService).%New()
+ Do ToeleveringServiceMock.VerwachtMethodCall("HeeftToeleveringMinstensEenSpaceStep", DnaCode3.Toelevering).DanDoeNiks()
+ Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(DnaCodeRepositoryMock,,,,,,,,,, ToeleveringServiceMock)
+
#dim Antwoord As WS.Halux.AAP.DnaCodeAfmeldenResponse = DnaCodeService.DnaCodeAfmelden(Request)
Do $$$AssertEquals(Antwoord.Header.Status,"200")
Do $$$AssertEquals(Antwoord.DnaCodes.Count(),1)
Do $$$AssertEquals(Antwoord.DnaCodes.GetAt(1).Locatie,$$$DummyString)
Do DnaCodeRepositoryMock.Verifieer()
+ Do ToeleveringServiceMock.Verifieer()
]]>