Index: AAPClient/UI/HernoemPalletScherm.pas =================================================================== diff -u -r157 -r196 --- AAPClient/UI/HernoemPalletScherm.pas (.../HernoemPalletScherm.pas) (revision 157) +++ AAPClient/UI/HernoemPalletScherm.pas (.../HernoemPalletScherm.pas) (revision 196) @@ -51,7 +51,7 @@ implementation uses - UiContext; + UiContext, Agent; {$R *.dfm} @@ -121,41 +121,24 @@ function TfmHernoemPalletScherm.HernoemPallet(OudeCode, NieuweCode: string): HernoemPalletResponse; var - Service: DnaCodeServiceSoap; - Request: HernoemPalletRequest; Response: HernoemPalletResponse; - Header: RequestHeader; begin - Service := DnaCodeService.GetDnaCodeServiceSoap(); - // request opbouwen - Request := HernoemPalletRequest.Create; - Header := RequestHeader.Create; + Response := TAgent.Create(UiContext).HernoemPallet(OudeCode, NieuweCode, ''); try - Header.Initialen := UiContext.Initialen; - Header.ComputerNaam := FullName(); - Request.Header := Header; - Request.OudeCode := OudeCode; - Request.NieuweCode := NieuweCode; - - Response := Service.HernoemPallet(Request); - try - if Response.Header.Status <> '200' then begin - ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw','') + if Response.Header.Status <> '200' then begin + ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw','') + end else begin + if NieuweCode = '' then begin + VulGridMetToeleveringData(Response.DnaCodes); + pcHernoemPallet.ActivePageIndex := 1; end else begin - if NieuweCode = '' then begin - VulGridMetToeleveringData(Response.DnaCodes); - pcHernoemPallet.ActivePageIndex := 1; - end else begin - ToonPopupScherm(Response.Header.Omschrijving, 'OK',''); - Self.ModalResult := mrHome; - end; + ToonPopupScherm(Response.Header.Omschrijving, 'OK',''); + Self.ModalResult := mrHome; end; - finally - result := Response; - Response.Free; end; finally - Request.Free; + result := Response; + Response.Free; end; if Self.ModalResult = mrHome then CloseModal;