Index: AAPClient/Win32/Debug/ProScan.exe =================================================================== diff -u -r60 -r61 Binary files differ Index: AAPClient/ProScanMain.pas =================================================================== diff -u -r59 -r61 --- AAPClient/ProScanMain.pas (.../ProScanMain.pas) (revision 59) +++ AAPClient/ProScanMain.pas (.../ProScanMain.pas) (revision 61) @@ -167,16 +167,16 @@ (fHuidigScherm as TfmInfoLogScherm).lblToelevering.Caption := fHuidigeToelevering; fModalResult := fHuidigScherm.ShowModal; if fHuidigScherm.ModalResult = mrYes then begin - fHuidigScherm := fmInfoLogScherm; + fHuidigScherm := fInfoLogScherm; end else if fHuidigScherm.ModalResult = mrOk then begin fHuidigScherm := fDnaCodeScherm; end else if fHuidigScherm.ModalResult = mrNone then begin - fHuidigScherm := fmInfoLogScherm; + fHuidigScherm := fInfoLogScherm; end else if fHuidigScherm.ModalResult = mrIgnore then begin - fHuidigScherm := fmInfoLogScherm; + fHuidigScherm := fInfoLogScherm; end; continue; end; Index: AAPClient/UI/InfoLogScherm.pas =================================================================== diff -u -r60 -r61 --- AAPClient/UI/InfoLogScherm.pas (.../InfoLogScherm.pas) (revision 60) +++ AAPClient/UI/InfoLogScherm.pas (.../InfoLogScherm.pas) (revision 61) @@ -24,7 +24,7 @@ private ToonGescand: boolean; function ToeleveringDataOphalen(): ZoekViaToeleveringResponse; - procedure VulGridMetToeleveringData(Response: ZoekViaToeleveringResponse); + procedure VulGridMetToeleveringData(DnaCodes: array of DnaCode); procedure GridLeegmaken(); public { Public declarations } @@ -67,6 +67,8 @@ try if Response.Header.Status <> '200' then begin ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw') + end else begin + VulGridMetToeleveringData(Response.DnaCodes); end; finally Response.Free; @@ -83,7 +85,7 @@ inherited; ToonGescand := not(ToonGescand); Response := ToeleveringDataOphalen(); - VulGridMetToeleveringData(Response); + VulGridMetToeleveringData(Response.DnaCodes); end; procedure TfmInfoLogScherm.FormCreate(Sender: TObject); @@ -103,7 +105,7 @@ btnCentraalOnder.Action := actOngedaanMaken; btnRechtsOnder.Action := actVolgende; Response := ToeleveringDataOphalen(); - VulGridMetToeleveringData(Response); + VulGridMetToeleveringData(Response.DnaCodes); end; function TfmInfoLogScherm.ToeleveringDataOphalen: ZoekViaToeleveringResponse; @@ -146,16 +148,16 @@ end; end; -procedure TfmInfoLogScherm.VulGridMetToeleveringData(Response: ZoekViaToeleveringResponse); +procedure TfmInfoLogScherm.VulGridMetToeleveringData(DnaCodes: array of DnaCode); var DnaCodeTeller: Integer; begin GridLeegMaken(); - for DnaCodeTeller := 0 to length(Response.DnaCodes)-1 do begin - if (ToonGescand and (Response.DnaCodes[DnaCodeTeller].InitialenScanner <> '')) or - ((not ToonGescand) and (Response.DnaCodes[DnaCodeTeller].InitialenScanner = '')) then begin - sgToeleveringData.Rows[sgToeleveringData.RowCount-1].Add(Response.DnaCodes[DnaCodeTeller].DnaCode); - sgToeleveringData.Rows[sgToeleveringData.RowCount-1].Append(Response.DnaCodes[DnaCodeTeller].PalletCode); + for DnaCodeTeller := 0 to length(DnaCodes)-1 do begin + if (ToonGescand and (DnaCodes[DnaCodeTeller].InitialenScanner <> '')) or + ((not ToonGescand) and (DnaCodes[DnaCodeTeller].InitialenScanner = '')) then 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; end; Index: AAPClient/Win32/Debug/ProScanMain.dcu =================================================================== diff -u -r59 -r61 Binary files differ