Index: AAPClient/UI/HernoemPalletScherm.dfm =================================================================== diff -u -r154 -r196 --- AAPClient/UI/HernoemPalletScherm.dfm (.../HernoemPalletScherm.dfm) (revision 154) +++ AAPClient/UI/HernoemPalletScherm.dfm (.../HernoemPalletScherm.dfm) (revision 196) @@ -14,7 +14,6 @@ Align = alClient BevelOuter = bvNone TabOrder = 3 - ExplicitHeight = 301 object lblPallet: TLabel Left = 107 Top = 10 @@ -39,11 +38,12 @@ Align = alClient Style = tsFlatButtons TabOrder = 2 - ExplicitTop = 358 - ExplicitHeight = 150 object tsOudeCode: TTabSheet Caption = 'tsOudeCode' TabVisible = False + ExplicitLeft = 0 + ExplicitTop = 0 + ExplicitWidth = 0 ExplicitHeight = 140 object lblOudeCode: TLabel Left = 13 @@ -81,6 +81,9 @@ Caption = 'tsResultaat' ImageIndex = 1 TabVisible = False + ExplicitLeft = 0 + ExplicitTop = 0 + ExplicitWidth = 0 ExplicitHeight = 140 object sgToeleveringData: TStringGrid Left = 4 @@ -149,7 +152,6 @@ Caption = 'tsNieuweCode' ImageIndex = 2 TabVisible = False - ExplicitHeight = 140 object lblNieuweCode: TLabel Left = 13 Top = 158 Index: AAPClient/WS/Agent.pas =================================================================== diff -u -r195 -r196 --- AAPClient/WS/Agent.pas (.../Agent.pas) (revision 195) +++ AAPClient/WS/Agent.pas (.../Agent.pas) (revision 196) @@ -20,6 +20,7 @@ function ZoekViaPalletCode(PalletCode: string): ZoekViaPalletCodeResponse; function DnaCodeAfmelden(DnaCode, Toelevering, PalletCode: string; Aantal: integer): DnaCodeAfmeldenResponse; function ZoekViaToelevering(Toelevering: string): ZoekViaToeleveringResponse; + function HernoemPallet(OudeCode, NieuweCode, EnkelDezeDnaCode: string): HernoemPalletResponse; end; implementation @@ -109,6 +110,30 @@ end; end; +function TAgent.HernoemPallet(OudeCode, NieuweCode, EnkelDezeDnaCode: string): HernoemPalletResponse; +var + Service: DnaCodeServiceSoap; + Request: HernoemPalletRequest; + Header: DnaCodeService.RequestHeader; +begin + Service := DnaCodeService.GetDnaCodeServiceSoap(); + + Request := HernoemPalletRequest.Create; + Header := DnaCodeService.RequestHeader.Create; + try + Header.Initialen := fUiContext.Initialen; + Header.ComputerNaam := FullName(); + Request.Header := Header; + Request.OudeCode := OudeCode; + Request.NieuweCode := NieuweCode; + Request.EnkelDezeDnaCode := EnkelDezeDnaCode; + + result := Service.HernoemPallet(Request); + finally + Request.Free; + end; +end; + function TAgent.ValideerPalletCode(PalletCode: string): ValideerPalletCodeResponse; var Service: DnaCodeServiceSoap; @@ -129,7 +154,6 @@ finally Request.Free; end; - end; function TAgent.ZoekViaPalletCode( 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;