Index: AAPClient/UI/HernoemPalletScherm.pas =================================================================== diff -u -r97 -r102 --- AAPClient/UI/HernoemPalletScherm.pas (.../HernoemPalletScherm.pas) (revision 97) +++ AAPClient/UI/HernoemPalletScherm.pas (.../HernoemPalletScherm.pas) (revision 102) @@ -5,15 +5,31 @@ uses Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs, DrieKnoppenScherm, Vcl.ActnList, - Vcl.StdCtrls; + Vcl.StdCtrls, Vcl.Grids, Vcl.ComCtrls, Vcl.ExtCtrls, DnaCodeService; type TfmHernoemPalletScherm = class(TfmDrieKnoppenScherm) + pnlHoofd: TPanel; + pcHernoemPallet: TPageControl; + tsInput: TTabSheet; + tsResultaat: TTabSheet; + edtPallet: TEdit; + lblScanPallet: TLabel; + sgToeleveringData: TStringGrid; + btnEerst: TButton; + btnVorige: TButton; + btnVolgende: TButton; + btnLaatst: TButton; + lblPallet: TLabel; + lblAantal: TLabel; procedure FormShow(Sender: TObject); procedure actHomeExecute(Sender: TObject); procedure actVolgendeExecute(Sender: TObject); + procedure FormCreate(Sender: TObject); private - { Private declarations } + procedure VulGridMetToeleveringData(DnaCodes: array of DnaCode); + procedure GridLeegmaken; + function HernoemPallet(OudeCode: string): HernoemPalletResponse; public { Public declarations } end; @@ -37,14 +53,79 @@ procedure TfmHernoemPalletScherm.actVolgendeExecute(Sender: TObject); begin inherited; - // + if pcHernoemPallet.ActivePageIndex = 0 then begin + HernoemPallet(edtPallet.Text); + end; end; -procedure TfmHernoemPalletScherm.FormShow(Sender: TObject); +function TfmHernoemPalletScherm.HernoemPallet(OudeCode: string): HernoemPalletResponse; +var + Service: DnaCodeServiceSoap; + Request: HernoemPalletRequest; + Response: HernoemPalletResponse; + Header: RequestHeader; begin + Service := DnaCodeService.GetDnaCodeServiceSoap(); + // request opbouwen + Request := HernoemPalletRequest.Create; + Header := RequestHeader.Create; + try + Header.Initialen := UiContext.Initialen; + Header.ComputerNaam := ComputerName(); + Request.Header := Header; + Request.OudeCode := OudeCode; + + Response := Service.HernoemPallet(Request); + try + if Response.Header.Status <> '200' then begin + ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw') + end else begin + VulGridMetToeleveringData(Response.DnaCodes); + pcHernoemPallet.ActivePageIndex := 1; + end; + finally + result := Response; + Response.Free; + end; + finally + Request.Free; + end; +end; + +procedure TfmHernoemPalletScherm.FormCreate(Sender: TObject); +begin inherited; + pcHernoemPallet.ActivePageIndex := 0; +end; +procedure TfmHernoemPalletScherm.FormShow(Sender: TObject); +begin + inherited; + btnCentraalOnder.Action := actHome; btnRechtsOnder.Action := actVolgende; end; +procedure TfmHernoemPalletScherm.VulGridMetToeleveringData(DnaCodes: array of DnaCode); +var + DnaCodeTeller: Integer; +begin + GridLeegMaken(); + for DnaCodeTeller := 0 to length(DnaCodes)-1 do begin + sgToeleveringData.Rows[sgToeleveringData.RowCount-1].Add(DnaCodes[DnaCodeTeller].DnaCode); + sgToeleveringData.Rows[sgToeleveringData.RowCount-1].Append(DnaCodes[DnaCodeTeller].PalletCode); + sgToeleveringData.RowCount := sgToeleveringData.RowCount + 1; + end; + if sgToeleveringData.RowCount > 2 then + sgToeleveringData.RowCount := sgToeleveringData.RowCount - 1; +end; + +procedure TfmHernoemPalletScherm.GridLeegmaken; +var + i: Integer; +begin + for i := 1 to sgToeleveringData.RowCount do + sgToeleveringData.Rows[i].Clear; + sgToeleveringData.RowCount := 2; +end; + end. Index: AAPClient/UI/HernoemPalletScherm.dfm =================================================================== diff -u -r97 -r102 --- AAPClient/UI/HernoemPalletScherm.dfm (.../HernoemPalletScherm.dfm) (revision 97) +++ AAPClient/UI/HernoemPalletScherm.dfm (.../HernoemPalletScherm.dfm) (revision 102) @@ -1,9 +1,142 @@ inherited fmHernoemPalletScherm: TfmHernoemPalletScherm PixelsPerInch = 96 TextHeight = 19 - inherited btnLinksOnder: TButton - Action = nil + object pnlHoofd: TPanel [1] + Left = 0 + Top = 0 + Width = 232 + Height = 39 + Align = alClient + BevelOuter = bvNone + TabOrder = 1 + ExplicitLeft = 8 + ExplicitTop = 88 + ExplicitWidth = 209 + ExplicitHeight = 95 + object lblPallet: TLabel + Left = 107 + Top = 10 + Width = 118 + Height = 19 + AutoSize = False + end + object lblAantal: TLabel + Left = 98 + Top = 20 + Width = 118 + Height = 19 + AutoSize = False + end end + inherited pnlDrieKnoppen: TPanel + inherited btnLinksOnder: TButton + Action = nil + end + end + object pcHernoemPallet: TPageControl [3] + Left = 0 + Top = 39 + Width = 232 + Height = 150 + ActivePage = tsInput + Align = alBottom + Style = tsFlatButtons + TabOrder = 2 + object tsInput: TTabSheet + Caption = 'tsInput' + TabVisible = False + ExplicitTop = 33 + ExplicitHeight = 113 + object lblScanPallet: TLabel + Left = 3 + Top = 38 + Width = 218 + Height = 19 + Alignment = taCenter + Caption = 'Scan oude pallet- of DNA-code' + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -16 + Font.Name = 'Tahoma' + Font.Style = [] + ParentFont = False + WordWrap = True + end + object edtPallet: TEdit + Left = 59 + Top = 73 + Width = 121 + Height = 27 + CharCase = ecUpperCase + TabOrder = 0 + end + end + object tsResultaat: TTabSheet + Caption = 'tsResultaat' + ImageIndex = 1 + TabVisible = False + ExplicitTop = 33 + ExplicitHeight = 113 + object sgToeleveringData: TStringGrid + Left = 4 + Top = 18 + Width = 186 + Height = 120 + ColCount = 1 + DefaultColWidth = 93 + DrawingStyle = gdsGradient + FixedCols = 0 + RowCount = 2 + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -13 + Font.Name = 'Tahoma' + Font.Style = [] + Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goRowSelect] + ParentFont = False + ScrollBars = ssNone + TabOrder = 0 + ColWidths = ( + 183) + end + object btnEerst: TButton + Left = 196 + Top = 18 + Width = 25 + Height = 25 + ImageIndex = 2 + Images = ImagesScherm.ilAlgemeen16 + TabOrder = 1 + end + object btnVorige: TButton + Left = 196 + Top = 49 + Width = 25 + Height = 25 + ImageIndex = 1 + Images = ImagesScherm.ilAlgemeen16 + TabOrder = 2 + end + object btnVolgende: TButton + Left = 196 + Top = 81 + Width = 25 + Height = 25 + ImageIndex = 0 + Images = ImagesScherm.ilAlgemeen16 + TabOrder = 3 + end + object btnLaatst: TButton + Left = 196 + Top = 112 + Width = 25 + Height = 25 + ImageIndex = 3 + Images = ImagesScherm.ilAlgemeen16 + TabOrder = 4 + end + end + end inherited alAlgemeen: TActionList inherited actVolgende: TAction OnExecute = actVolgendeExecute