Index: AAPClient/UI/DnaCodeScherm.pas =================================================================== diff -u -r82 -r85 --- AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 82) +++ AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 85) @@ -29,8 +29,8 @@ private procedure MeldDnaCodeAf(); procedure ZetToeleveringStatus(Status: DnaCodeStatus); + procedure ToeleveringDataOphalen(); public - function GeefToelevering: String; end; var @@ -104,14 +104,13 @@ edtDnaCode.Text := ''; ActiveControl := edtDnaCode; lblPalletCode.Caption := UiContext.Pallet; + + if not (UiContext.Toelevering = '') then + ToeleveringDataOphalen(); + inherited; end; -function TfmDnaCodeScherm.GeefToelevering: String; -begin - result := UiContext.Toelevering; -end; - procedure TfmDnaCodeScherm.MeldDnaCodeAf; var Service: DnaCodeServiceSoap; @@ -157,6 +156,46 @@ end; end; +procedure TfmDnaCodeScherm.ToeleveringDataOphalen; +var + Service: DnaCodeServiceSoap; + Request: ZoekViaToeleveringRequest; + Response: ZoekViaToeleveringResponse; + Header: RequestHeader; +begin + Service := DnaCodeService.GetDnaCodeServiceSoap(); + // request opbouwen + Request := ZoekViaToeleveringRequest.Create; + Header := RequestHeader.Create; + try + Header.Initialen := UiContext.Initialen; + Header.ComputerNaam := ComputerName(); + Request.Header := Header; + Request.Toelevering := UiContext.Toelevering; + + Response := Service.ZoekViaToelevering(Request); + try + if Response.Header.Status <> '200' then begin + ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw') + end else begin + UiContext.Toelevering := Response.DnaCodes[0].Toelevering; + lblToelevering.Caption := UiContext.Toelevering; + lblAantalGescand.Caption := IntToStr(Response.AantalReedsGescand); + lblTotaalAantal.Caption := IntToStr(Response.AantalInToelevering); + if Response.DnaCodes[0].IsGlsDirect then begin + ToonPopupScherm('GLS DIRECT', 'OK'); + imgGls.Visible := Response.DnaCodes[0].IsGlsDirect; + end; + Self.ModalResult := mrDnaCode; + end; + finally + Response.Free; + end; + finally + Request.Free; + end; +end; + procedure TfmDnaCodeScherm.ZetToeleveringStatus(Status: DnaCodeStatus); var Service: DnaCodeServiceSoap;