Index: AAPClient/UI/HernoemPalletScherm.pas =================================================================== diff -u -r103 -r104 --- AAPClient/UI/HernoemPalletScherm.pas (.../HernoemPalletScherm.pas) (revision 103) +++ AAPClient/UI/HernoemPalletScherm.pas (.../HernoemPalletScherm.pas) (revision 104) @@ -11,25 +11,32 @@ TfmHernoemPalletScherm = class(TfmDrieKnoppenScherm) pnlHoofd: TPanel; pcHernoemPallet: TPageControl; - tsInput: TTabSheet; + tsOudeCode: TTabSheet; tsResultaat: TTabSheet; - edtPallet: TEdit; - lblScanPallet: TLabel; + edtOudeCode: TEdit; + lblOudeCode: TLabel; sgToeleveringData: TStringGrid; btnEerst: TButton; btnVorige: TButton; btnVolgende: TButton; btnLaatst: TButton; lblPallet: TLabel; lblAantal: TLabel; + tsNieuweCode: TTabSheet; + edtNieuweCode: TEdit; + lblNieuweCode: TLabel; procedure FormShow(Sender: TObject); procedure actHomeExecute(Sender: TObject); procedure actVolgendeExecute(Sender: TObject); procedure FormCreate(Sender: TObject); + procedure btnEerstClick(Sender: TObject); + procedure btnVorigeClick(Sender: TObject); + procedure btnVolgendeClick(Sender: TObject); + procedure btnLaatstClick(Sender: TObject); private procedure VulGridMetToeleveringData(DnaCodes: array of DnaCode); procedure GridLeegmaken; - function HernoemPallet(OudeCode: string): HernoemPalletResponse; + function HernoemPallet(OudeCode, NieuweCode: string): HernoemPalletResponse; public { Public declarations } end; @@ -54,11 +61,41 @@ begin inherited; if pcHernoemPallet.ActivePageIndex = 0 then begin - HernoemPallet(edtPallet.Text); + HernoemPallet(edtOudeCode.Text,''); + end else if pcHernoemPallet.ActivePageIndex = 1 then begin + pcHernoemPallet.ActivePageIndex := 2; + end else if pcHernoemPallet.ActivePageIndex = 2 then begin + HernoemPallet(edtOudeCode.Text, edtNieuweCode.Text); end; end; -function TfmHernoemPalletScherm.HernoemPallet(OudeCode: string): HernoemPalletResponse; +procedure TfmHernoemPalletScherm.btnEerstClick(Sender: TObject); +begin + inherited; + sgToeleveringData.Row := 1; +end; + +procedure TfmHernoemPalletScherm.btnLaatstClick(Sender: TObject); +begin + inherited; + sgToeleveringData.Row := sgToeleveringData.RowCount - 1; +end; + +procedure TfmHernoemPalletScherm.btnVolgendeClick(Sender: TObject); +begin + inherited; + if sgToeleveringData.Row < sgToeleveringData.RowCount - 1 then + sgToeleveringData.Row := sgToeleveringData.Row + 1 +end; + +procedure TfmHernoemPalletScherm.btnVorigeClick(Sender: TObject); +begin + inherited; + if sgToeleveringData.Row > 1 then + sgToeleveringData.Row := sgToeleveringData.Row - 1; +end; + +function TfmHernoemPalletScherm.HernoemPallet(OudeCode, NieuweCode: string): HernoemPalletResponse; var Service: DnaCodeServiceSoap; Request: HernoemPalletRequest; @@ -74,6 +111,7 @@ Header.ComputerNaam := ComputerName(); Request.Header := Header; Request.OudeCode := OudeCode; + Request.OudeCode := NieuweCode; Response := Service.HernoemPallet(Request); try