Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml =================================================================== diff -u -r73701 -r75015 --- WSimpl/Halux/AAP/DnaCodeService.cls.xml (.../DnaCodeService.cls.xml) (revision 73701) +++ WSimpl/Halux/AAP/DnaCodeService.cls.xml (.../DnaCodeService.cls.xml) (revision 75015) @@ -88,8 +88,17 @@ 1 + +APPS.Halux.PPS.MES.MESService +1 + + + +DOM.PM.impl.ProductTypeAPIimpl + + -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="",DocumentGenerator:APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective="",DnaCodeHelper:APPS.Halux.AAP.DnaCodeService.DnaCodeServiceHelper="" +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="",DocumentGenerator:APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective="",DnaCodeHelper:APPS.Halux.AAP.DnaCodeService.DnaCodeServiceHelper="",ProductTypeAPI:DOM.PM.impl.ProductTypeAPIimpl="",VerzendDirectControleur:BL.MB.UGLYPicking.VerzendDirectControleur="" 1 1 %Status @@ -104,13 +113,15 @@ Set ..VerkoopAPI = $$$Inject(VerkoopAPI, ##class(DOM.VKP.impl.VerkoopAPI).%New()) Set ..AantalGescandeVhossSequentieItemsBepaler = $$$Inject(AantalGescandeVhossSequentieItemsBepaler,##class(WSimpl.Halux.AAP.DnaCodeService.AantalGescandeVhossSequentieItemsBepaler).%New()) Set ..DnaCodeInVhossKastBepaler = $$$Inject(DnaCodeInVhossKastBepaler,##class(WSimpl.Halux.AAP.DnaCodeService.DnaCodeInVhossKastBepaler).%New()) - Set ..VerzendDirectControleur = ##class(BL.MB.UGLYPicking.VerzendDirectControleur).%New() + Set ..VerzendDirectControleur = $$$Inject(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() Set ..DocumentGenerator = $$$Inject(DocumentGenerator, ##class(APPS.Halux.Afmelden.impl.DocumentLadeGerecepteerdNaarObjective).%New()) Set ..DnaCodeHelper = $$$Inject(DnaCodeHelper, ##class(APPS.Halux.AAP.DnaCodeService.DnaCodeServiceHelper).%New()) + Set ..MESService = ##class(APPS.Halux.PPS.MES.MESService).%New() + Set ..ProductTypeAPI = $$$Inject(ProductTypeAPI, ##class(DOM.PM.impl.ProductTypeAPIimpl).%New()) Quit $$$OK ]]> @@ -381,10 +392,14 @@ Do ..DnaCodeRepository.Bewaar(DnaCode) - #dim IsDnaCodeVoorSpaceStep As %Boolean = ..DnaCodeHelper.IsSpaceStepGeneriekProduct(DnaCode, DnaCode.ProductNummer) - If $$$Not(IsDnaCodeVoorSpaceStep) { - Do ..DocumentGenerator.GenereerDocumentVoorObjective(DnaCode.DnaCode) - } + #dim MesFaseActief As %Integer = 1 + #dim CategorTLM As %Boolean = ((..ProductTypeAPI.IsLegraboxProduct(DnaCode.ProductNummer) || ..ProductTypeAPI.IsMerivoboxProduct(DnaCode.ProductNummer) || ..ProductTypeAPI.IsTandemboxProduct(DnaCode.ProductNummer))) + If ((..MESService.IsActiefVoorMes(DnaCode.Lijn, MesFaseActief) && CategorTLM) && (..MESService.GeefHuidigeMESFase() = 1)) { + #dim IsDnaCodeVoorSpaceStep As %Boolean = ..DnaCodeHelper.IsSpaceStepGeneriekProduct(DnaCode, DnaCode.ProductNummer) + If $$$Not(IsDnaCodeVoorSpaceStep) { + Do ..DocumentGenerator.GenereerDocumentVoorObjective(DnaCode.DnaCode) + } + } If ..IsGeldigeVhossCode(DnaCodeAfmeldenRequest.PalletCode) { Set Response = ..AantalGescandeVhossSequentieItemsBepaler.BepaalAantalGescandeVhossSequentieItems(DnaCode) @@ -522,6 +537,51 @@ ]]> + +PalletBijwerkenRequest:WS.Halux.AAP.PalletBijwerkenOBJTRequest +WS.Halux.AAP.PalletBijwerkenOBJTResponse + + + HernoemPalletRequest:WS.Halux.AAP.HernoemPalletRequest WS.Halux.AAP.HernoemPalletResponse @@ -678,7 +738,7 @@ + +ToeleveringId:%String +1 +%Boolean + + + GeefVolgendeTbpCodeRequest:WS.Halux.AAP.GeefVolgendeTbpCodeRequest WS.Halux.AAP.GeefVolgendeTbpCodeResponse