Index: AAPClient/UI/DnaCodeScherm.pas =================================================================== diff -u -r253 -r276 --- AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 253) +++ AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 276) @@ -42,6 +42,7 @@ function BepaalDirecteLevering: boolean; procedure PalletBijwerken(Status: DnaCodeStatus; IsDirecteLevering: boolean); procedure ZetIcoontjesBovenaan; + procedure DrukProboxEtiketAfIndienNodig; public end; @@ -55,6 +56,43 @@ {$R *.dfm} +procedure TfmDnaCodeScherm.FormActivate(Sender: TObject); +begin + inherited; + ActiveControl := edtDnaCode; +end; + +procedure TfmDnaCodeScherm.FormCreate(Sender: TObject); +begin + inherited; + fImagesScherm := TImagesScherm.Create(self); +end; + +procedure TfmDnaCodeScherm.FormShow(Sender: TObject); +begin + btnLinksOnder.Action := actPallet; + btnCentraalOnder.Action := actHome; + btnRechtsOnder.Action := actAfronden; + edtDnaCode.Text := ''; + lblHuidigePalletData.Caption := UiContext.Pallet; + lblToeleveringData.Caption := UiContext.Toelevering; + lblAantalGescand.Caption := ''; + lblTotaalAantal.Caption := ''; + btnInfo.Visible := false; + fImagesScherm.ilAlgemeen64.GetIcon(8, imgToelevering.Picture.Icon); + fImagesScherm.ilAlgemeen64.GetIcon(9, imgPallet.Picture.Icon); + fImagesScherm.ilAlgemeen64.GetIcon(10, imgLaatstGescand.Picture.Icon); + if not (UiContext.Toelevering = '') then + ToeleveringDataOphalen() + else begin + imgDirecteLevering.Visible := false; + imgWegwerpPallet.Visible := false; + end; + ZetIcoontjesBovenaan; + edtDnaCode.SetFocus; + inherited; +end; + procedure TfmDnaCodeScherm.actHomeExecute(Sender: TObject); begin inherited; @@ -87,6 +125,34 @@ (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); end; +procedure TfmDnaCodeScherm.actAfrondenExecute(Sender: TObject); +var + fWaarschuwingModalResult: TModalResult; +begin + inherited; + if lblAantalGescand.Caption = lblTotaalAantal.Caption then begin + ZetToeleveringStatus(DnaCodeStatus.InBuffer); + if Self.ModalResult = mrPallet then begin + ToonPopupScherm('Toelevering succesvol afgerond','OK','',19,-1,-1,clGreen); + DrukProboxEtiketAfIndienNodig; + end; + end else begin + fWaarschuwingModalResult := ToonPopupScherm('Onvolledige toelevering','Scan code','Nieuw',18,11,12); + if fWaarschuwingModalResult = mrYes then begin + Self.ModalResult := mrDnaCode; + end else begin + fWaarschuwingModalResult := ToonPopupScherm('Nieuwe toelevering starten?','Ja','Nee',14,6,7); + if fWaarschuwingModalResult = mrYes then begin + ZetToeleveringStatus(DnaCodeStatus.OnHold); + Self.ModalResult := mrPallet; + end; + end; + + end; + PostMessage(Self.Handle,WM_Close,0,0); + (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); +end; + function TfmDnaCodeScherm.BepaalAantalLadesOpHuidigePallet: integer; var fZoekViaPalletCodeResponse: ZoekViaPalletCodeResponse; @@ -137,32 +203,6 @@ (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); end; -procedure TfmDnaCodeScherm.actAfrondenExecute(Sender: TObject); -var - fWaarschuwingModalResult: TModalResult; -begin - inherited; - if lblAantalGescand.Caption = lblTotaalAantal.Caption then begin - ZetToeleveringStatus(DnaCodeStatus.InBuffer); - if Self.ModalResult = mrPallet then - ToonPopupScherm('Toelevering succesvol afgerond','OK','',19,-1,-1,clGreen) - end else begin - fWaarschuwingModalResult := ToonPopupScherm('Onvolledige toelevering','Scan code','Nieuw',18,11,12); - if fWaarschuwingModalResult = mrYes then begin - Self.ModalResult := mrDnaCode; - end else begin - fWaarschuwingModalResult := ToonPopupScherm('Nieuwe toelevering starten?','Ja','Nee',14,6,7); - if fWaarschuwingModalResult = mrYes then begin - ZetToeleveringStatus(DnaCodeStatus.OnHold); - Self.ModalResult := mrPallet; - end; - end; - - end; - PostMessage(Self.Handle,WM_Close,0,0); - (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); -end; - procedure TfmDnaCodeScherm.edtDnaCodeKeyPress(Sender: TObject; var Key: Char); begin inherited; @@ -173,43 +213,6 @@ end; end; -procedure TfmDnaCodeScherm.FormActivate(Sender: TObject); -begin - inherited; - ActiveControl := edtDnaCode; -end; - -procedure TfmDnaCodeScherm.FormCreate(Sender: TObject); -begin - inherited; - fImagesScherm := TImagesScherm.Create(self); -end; - -procedure TfmDnaCodeScherm.FormShow(Sender: TObject); -begin - btnLinksOnder.Action := actPallet; - btnCentraalOnder.Action := actHome; - btnRechtsOnder.Action := actAfronden; - edtDnaCode.Text := ''; - lblHuidigePalletData.Caption := UiContext.Pallet; - lblToeleveringData.Caption := UiContext.Toelevering; - lblAantalGescand.Caption := ''; - lblTotaalAantal.Caption := ''; - btnInfo.Visible := false; - fImagesScherm.ilAlgemeen64.GetIcon(8, imgToelevering.Picture.Icon); - fImagesScherm.ilAlgemeen64.GetIcon(9, imgPallet.Picture.Icon); - fImagesScherm.ilAlgemeen64.GetIcon(10, imgLaatstGescand.Picture.Icon); - if not (UiContext.Toelevering = '') then - ToeleveringDataOphalen() - else begin - imgDirecteLevering.Visible := false; - imgWegwerpPallet.Visible := false; - end; - ZetIcoontjesBovenaan; - edtDnaCode.SetFocus; - inherited; -end; - procedure TfmDnaCodeScherm.MeldDnaCodeAf; var Response: DnaCodeAfmeldenResponse; @@ -356,8 +359,46 @@ finally Response.Free; end; - PostMessage(Self.Handle,WM_Close,0,0); - (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); + //PostMessage(Self.Handle,WM_Close,0,0); + //(Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); end; +procedure TfmDnaCodeScherm.DrukProboxEtiketAfIndienNodig; +var + fProboxAfdrukkenResponse: ProboxEtiketAfdrukkenResponse; + fZoekViaPalletCodeResponse: ZoekViaPalletCodeResponse; + DnaCodesStringList: TStringList; + DnaCodes: ArrayOfDnaCodeDnaCode; + ii: integer; +begin + fZoekViaPalletCodeResponse := TAgent.Create(UiContext).ZoekViaPalletCode(UiContext.Pallet); + try + if fZoekViaPalletCodeResponse.Header.Status = '200' then begin + DnaCodes := fZoekViaPalletCodeResponse.DnaCodes; + end else begin + ToonPopupScherm(fZoekViaPalletCodeResponse.Header.Omschrijving, 'Bel planning'); + end; + finally + fZoekViaPalletCodeResponse.Free; + end; + + DnaCodesStringList := TStringList.Create(); + ii := 0; + while ii < length(DnaCodes)-1 do begin + DnaCodesStringList.Add(DnaCodes[ii].DnaCode) + end; + + fProboxAfdrukkenResponse := TAgent.Create(UiContext).ProboxEtiketAfdrukken(DnaCodesStringList); + try + if fProboxAfdrukkenResponse.Header.Status <> '200' then begin + Self.ModalResult := mrDnaCode; + ToonPopupScherm(fProboxAfdrukkenResponse.Header.Omschrijving, 'Bel planning') + end else begin + Self.ModalResult := mrPallet; + end; + finally + fProboxAfdrukkenResponse.Free; + end; +end; + end.