Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r58593 -r58599
--- WSimpl/Halux/AAP/DnaCodeService.cls.xml (.../DnaCodeService.cls.xml) (revision 58593)
+++ WSimpl/Halux/AAP/DnaCodeService.cls.xml (.../DnaCodeService.cls.xml) (revision 58599)
@@ -23,8 +23,13 @@
1
+
+APPS.MAG.Inventaris.impl.InventarisService
+1
+
+
-DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository="",PalletCodeValidator:WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator=""
+DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository="",PalletCodeValidator:WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator="",InventarisService:APPS.MAG.Inventaris.impl.InventarisService
1
1
%Status
@@ -33,6 +38,7 @@
Set ..DnaCodeRepository = $$$Inject(DnaCodeRepository, ##class(DOM.Halux.AAP.DnaCodeRepository).%New())
Set ..PalletCodeValidator = $$$Inject(PalletCodeValidator, ##class(WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator).%New())
Set ..DateTimeAPI = ##class(TECH.Context).Instance().GeefDateTimeAPI()
+ Set ..InventarisService = $$$Inject(InventarisService, ##class(APPS.MAG.Inventaris.impl.InventarisService).%New())
Quit $$$OK
]]>
@@ -202,6 +208,7 @@
WS.Halux.AAP.ToeleveringBijwerkenResponse
WS.Halux.AAP.PalletBijwerkenResponse
1
+
+APPS.MAG.Inventaris.impl.InventarisService
+1
+
+
aTestName:%String
@@ -188,14 +194,17 @@
Do ..PalletCodeValidatorStub.IndienMethodCall("ValideerPalletCode",..Request.OudeCode).DanReturn($$$True)
Do ..PalletCodeValidatorStub.IndienMethodCall("ValideerPalletCode",..Request.NieuweCode).DanReturn($$$True)
- Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(..DnaCodeRepositoryMock, ..PalletCodeValidatorStub)
+ Do ..InventarisServiceMock.VerwachtMethodCall("HernoemPallet",..DnaCode1.PalletCode,..DnaCode2.PalletCode).DanDoeNiks()
+
+ Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(..DnaCodeRepositoryMock, ..PalletCodeValidatorStub, ..InventarisServiceMock)
#dim Antwoord As WS.Halux.AAP.HernoemPalletResponse = DnaCodeService.HernoemPallet(..Request)
Do $$$AssertEquals(Antwoord.Header.Status,"200")
Do $$$AssertEquals(Antwoord.Header.Omschrijving,"Pallet is succesvol gewijzigd")
Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
Do ..DnaCodeRepositoryMock.Verifieer()
+ Do ..InventarisServiceMock.Verifieer()
]]>
@@ -212,14 +221,17 @@
Do ..PalletCodeValidatorStub.IndienMethodCall("ValideerPalletCode",..DnaCode1.PalletCode).DanReturn($$$True)
Do ..PalletCodeValidatorStub.IndienMethodCall("ValideerPalletCode",..DnaCode2.PalletCode).DanReturn($$$True)
- Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(..DnaCodeRepositoryMock, ..PalletCodeValidatorStub)
+ Do ..InventarisServiceMock.VerwachtMethodCall("HernoemPallet",..DnaCode1.PalletCode,..DnaCode2.PalletCode).DanDoeNiks()
+
+ Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(..DnaCodeRepositoryMock, ..PalletCodeValidatorStub, ..InventarisServiceMock)
#dim Antwoord As WS.Halux.AAP.HernoemPalletResponse = DnaCodeService.HernoemPallet(..Request)
Do $$$AssertEquals(Antwoord.Header.Status,"200")
Do $$$AssertEquals(Antwoord.Header.Omschrijving,"Pallet is succesvol gewijzigd")
Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
Do ..DnaCodeRepositoryMock.Verifieer()
+ Do ..InventarisServiceMock.Verifieer()
]]>
@@ -236,14 +248,17 @@
Do ..PalletCodeValidatorStub.IndienMethodCall("ValideerPalletCode",..DnaCode1.PalletCode).DanReturn($$$True)
Do ..PalletCodeValidatorStub.IndienMethodCall("ValideerPalletCode",..DnaCode2.PalletCode).DanReturn($$$True)
- Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(..DnaCodeRepositoryMock, ..PalletCodeValidatorStub)
+ Do ..InventarisServiceMock.VerwachtMethodCall("HernoemPallet",..DnaCode1.PalletCode,..DnaCode2.PalletCode).DanDoeNiks()
+
+ Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(..DnaCodeRepositoryMock, ..PalletCodeValidatorStub, ..InventarisServiceMock)
#dim Antwoord As WS.Halux.AAP.HernoemPalletResponse = DnaCodeService.HernoemPallet(..Request)
Do $$$AssertEquals(Antwoord.Header.Status,"200")
Do $$$AssertEquals(Antwoord.Header.Omschrijving,"Pallet is succesvol gewijzigd")
Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
Do ..DnaCodeRepositoryMock.Verifieer()
+ Do ..InventarisServiceMock.Verifieer()
]]>
@@ -259,14 +274,17 @@
Do ..PalletCodeValidatorStub.IndienMethodCall("ValideerPalletCode",..DnaCode1.PalletCode).DanReturn($$$True)
Do ..PalletCodeValidatorStub.IndienMethodCall("ValideerPalletCode",..DnaCode2.PalletCode).DanReturn($$$True)
- Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(..DnaCodeRepositoryMock, ..PalletCodeValidatorStub)
+ Do ..InventarisServiceMock.VerwachtMethodCall("HernoemPallet",..DnaCode1.PalletCode,..DnaCode2.PalletCode).DanDoeNiks()
+
+ Set DnaCodeService = ##class(WSimpl.Halux.AAP.DnaCodeService).%New(..DnaCodeRepositoryMock, ..PalletCodeValidatorStub, ..InventarisServiceMock)
#dim Antwoord As WS.Halux.AAP.HernoemPalletResponse = DnaCodeService.HernoemPallet(..Request)
Do $$$AssertEquals(Antwoord.Header.Status,"200")
Do $$$AssertEquals(Antwoord.Header.Omschrijving,"Pallet is succesvol gewijzigd")
Do $$$AssertEquals(Antwoord.DnaCodes.Count(),0)
Do ..DnaCodeRepositoryMock.Verifieer()
+ Do ..InventarisServiceMock.Verifieer()
]]>
Index: BL/MB/UGLYPicking/Receptie.cls.xml
===================================================================
diff -u -r58121 -r58599
--- BL/MB/UGLYPicking/Receptie.cls.xml (.../Receptie.cls.xml) (revision 58121)
+++ BL/MB/UGLYPicking/Receptie.cls.xml (.../Receptie.cls.xml) (revision 58599)
@@ -2077,7 +2077,7 @@
While DnaCodeIterator.HasNext() {
Set DnaCode = DnaCodeIterator.Next()
If DnaCode.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).Gescand() {
- Set Status = ..AddToBuffer(RGID,VolgNr,DnaCode.ProductNummer,DnaCode.LadeCode,DnaCode.Locatie,DnaCode.PalletCode,Initialen,,,,,)
+ Set Status = ..AddToBuffer(RGID,VolgNr,DnaCode.ProductNummer,DnaCode.LadeCode,##class(APPS.MAG.enu.MagazijnTransitLocatie).Halux2Transit(),DnaCode.PalletCode,Initialen,,,,,)
}
}
;Buffer verwijderen indien geen lijnen aangemaakt (leeg)