Index: ProScan/ProScanMain.pas =================================================================== diff -u -r681 -r684 --- ProScan/ProScanMain.pas (.../ProScanMain.pas) (revision 681) +++ ProScan/ProScanMain.pas (.../ProScanMain.pas) (revision 684) @@ -29,7 +29,7 @@ implementation uses - OnderdelenScherm, DnaCodeSchermVoorOnderdelen, LoginScherm2, GebruikerService, HomeScherm, DrieKnoppenScherm, PalletScherm, + LoginScherm2, GebruikerService, HomeScherm, DrieKnoppenScherm, PalletScherm, BestaandePalletscherm, DnaCodeScherm, InfoLogScherm, Images, HernoemPalletScherm, DimmerForm, DnaCodeReedsGescandScherm, Agent; @@ -106,16 +106,14 @@ end else begin fHuidigScherm.Free; case mr of - mrLogin : fHuidigScherm := TfmLoginScherm2.Create(pnlMain); - mrHome : fHuidigScherm := TfmHomeScherm.Create(pnlMain); - mrPallet : fHuidigScherm := TfmPalletScherm.Create(pnlMain); - mrHernoemPallet : fHuidigScherm := TfmHernoemPalletScherm.Create(pnlMain); - mrBestaandePallet : fHuidigScherm := TfmBestaandePalletScherm.Create(pnlMain); - mrDnaCode : fHuidigScherm := TfmDnaCodeScherm.Create(pnlMain); - mrInfoLog : fHuidigScherm := TfmInfoLogScherm.Create(pnlMain); - mrDnaCodeReedsGescand : fHuidigScherm := TfmDnaCodeReedsGescandScherm.Create(pnlMain); - mrOnderdelen : fHuidigScherm := TfmOnderdelenScherm.Create(pnlMain); - mrDnaCodeVoorOnderdelen : fHuidigScherm := TfmDnaCodeSchermVoorOnderdelen.Create(pnlMain); + mrLogin : fHuidigScherm := TfmLoginScherm2.Create(pnlMain); + mrHome : fHuidigScherm := TfmHomeScherm.Create(pnlMain); + mrPallet : fHuidigScherm := TfmPalletScherm.Create(pnlMain); + mrHernoemPallet : fHuidigScherm := TfmHernoemPalletScherm.Create(pnlMain); + mrBestaandePallet : fHuidigScherm := TfmBestaandePalletScherm.Create(pnlMain); + mrDnaCode : fHuidigScherm := TfmDnaCodeScherm.Create(pnlMain); + mrInfoLog : fHuidigScherm := TfmInfoLogScherm.Create(pnlMain); + mrDnaCodeReedsGescand : fHuidigScherm := TfmDnaCodeReedsGescandScherm.Create(pnlMain); end; fHuidigScherm.Parent := pnlMain; Index: ProScan/UI/UiContext.pas =================================================================== diff -u -r681 -r684 --- ProScan/UI/UiContext.pas (.../UiContext.pas) (revision 681) +++ ProScan/UI/UiContext.pas (.../UiContext.pas) (revision 684) @@ -6,19 +6,17 @@ Images, Classes; const - mrLogin = 101; - mrHome = 102; - mrPallet = 103; - mrBestaandePallet = 104; - mrDnaCode = 105; - mrInfoLog = 106; - mrHernoemPallet = 107; - mrDnaCodeReedsGescand = 108; - mrOnderdelen = 109; - mrDnaCodeVoorOnderdelen = 110; - modusDefault = 1; - modusKAD = 2; - modusVHOSS = 3; + mrLogin = 101; + mrHome = 102; + mrPallet = 103; + mrBestaandePallet = 104; + mrDnaCode = 105; + mrInfoLog = 106; + mrHernoemPallet = 107; + mrDnaCodeReedsGescand = 108; + modusDefault = 1; + modusKAD = 2; + modusVHOSS = 3; type TUiContext = class @@ -45,7 +43,6 @@ fFormHoogte: integer; fLaatsteDnaCodeGoedAfgemeld: boolean; fLaatstAfgedrukteDnaCodes: TStringList; - fVanuitOnderdelen: boolean; public Constructor Create; overload; Property Initialen: String Read fInitialen Write fInitialen; @@ -70,7 +67,6 @@ Property FormHoogte: integer Read fFormHoogte Write fFormHoogte; Property LaatsteDnaCodeGoedAfgemeld: boolean Read fLaatsteDnaCodeGoedAfgemeld Write fLaatsteDnaCodeGoedAfgemeld; Property LaatstAfgedrukteDnaCodes: TStringList Read fLaatstAfgedrukteDnaCodes Write fLaatstAfgedrukteDnaCodes; - Property VanuitOnderdelen: boolean Read fVanuitOnderdelen Write fVanuitOnderdelen; end; implementation FishEye: Tag 684 refers to a dead (removed) revision in file `ProScan/UI/OnderdelenScherm.dfm'. FishEye: No comparison available. Pass `N' to diff? Index: ProScan/UI/InfoLogScherm.pas =================================================================== diff -u -r681 -r684 --- ProScan/UI/InfoLogScherm.pas (.../InfoLogScherm.pas) (revision 681) +++ ProScan/UI/InfoLogScherm.pas (.../InfoLogScherm.pas) (revision 684) @@ -64,12 +64,8 @@ procedure TfmInfoLogScherm.actTerugExecute(Sender: TObject); begin inherited; - Self.ModalResult := mrDnaCode; - if UiContext.VanuitOnderdelen then - Self.ModalResult := mrDnaCodeVoorOnderdelen; - PostMessage(Self.Handle,WM_Close,0,0); - (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); + (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode); end; procedure TfmInfoLogScherm.actOngedaanMakenExecute(Sender: TObject); FishEye: Tag 684 refers to a dead (removed) revision in file `ProScan/UI/DnaCodeSchermVoorOnderdelen.pas'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag 684 refers to a dead (removed) revision in file `ProScan/UI/DnaCodeSchermVoorOnderdelen.dfm'. FishEye: No comparison available. Pass `N' to diff? Index: ProScan/UI/PalletScherm.dfm =================================================================== diff -u -r676 -r684 --- ProScan/UI/PalletScherm.dfm (.../PalletScherm.dfm) (revision 676) +++ ProScan/UI/PalletScherm.dfm (.../PalletScherm.dfm) (revision 684) @@ -423,22 +423,6 @@ TabOrder = 3 OnClick = btnGenereerTbpClick end - object btnOnderdelen: TButton [6] - Left = 8 - Top = 104 - Width = 168 - Height = 49 - Caption = 'Onderdelen' - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -24 - Font.Name = 'Tahoma' - Font.Style = [] - ImageIndex = 0 - ParentFont = False - TabOrder = 4 - OnClick = btnGenereerTbpClick - end inherited alAlgemeen: TActionList inherited actVolgende: TAction OnExecute = actVolgendeExecute FishEye: Tag 684 refers to a dead (removed) revision in file `ProScan/UI/OnderdelenScherm.pas'. FishEye: No comparison available. Pass `N' to diff? Index: ProScan/UI/PalletScherm.pas =================================================================== diff -u -r679 -r684 --- ProScan/UI/PalletScherm.pas (.../PalletScherm.pas) (revision 679) +++ ProScan/UI/PalletScherm.pas (.../PalletScherm.pas) (revision 684) @@ -13,17 +13,14 @@ imgPallet: TImage; edtPallet: TEdit; btnGenereerTbp: TButton; - btnOnderdelen: TButton; procedure FormShow(Sender: TObject); procedure actHomeExecute(Sender: TObject); procedure actVolgendeExecute(Sender: TObject); procedure edtPalletKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState); procedure btnGenereerTbpClick(Sender: TObject); - procedure btnOnderdelenClick(Sender: TObject); procedure FormActivate(Sender: TObject); private - procedure ResetPopups; procedure SetContext; procedure SetModus(GescandeInput: string); function ValideerPalletCode(GescandeInput: string): boolean; @@ -52,19 +49,20 @@ var fZoekViaPalletCodeResponse: ZoekViaPalletCodeResponse; fZoekViaToeleveringResponse: ZoekViaToeleveringResponse; + fPalletGevalideerd: boolean; fAgent: TAgent; begin SetModus(edtPallet.Text); - if (UiContext.MoetTbpCodeGenereren = true) then begin - ResetPopups; - Self.ModalResult := mrDnaCode; - end else if (UiContext.Modus = modusKAD) then begin - Self.ModalResult := mrDnaCode; - end else if (UiContext.Modus = modusVHOSS) then begin - Self.ModalResult := mrDnaCode; - end else if (ValideerPalletCode(edtPallet.Text) = true) then begin - fAgent := TAgent.Create(UiContext); + fPalletGevalideerd := false; + if not (UiContext.Modus = modusKAD) then + fPalletGevalideerd := ValideerPalletCode(edtPallet.Text); + + //checken of pallet in gebruik is indien het vorige geslaagd is + if fPalletGevalideerd and not(UiContext.Modus = modusKAD) and not(UiContext.Modus = modusVHOSS ) then begin + if (UiContext.MoetTbpCodeGenereren = true) then + edtPallet.Text := '000000'; // Kleine hack om hieronder een foute statuscode te geven + fAgent := TAgent.Create(UiContext); fZoekViaPalletCodeResponse := fAgent.ZoekViaPalletCode(edtPallet.Text); fAgent.Free; try @@ -90,11 +88,20 @@ finally fZoekViaPalletCodeResponse.Free; end; - ResetPopups; + //popups resetten + UiContext.IsDirecteLeveringPopupGetoond := false; + UiContext.IsWegwerpPalletPopupGetoond := false; + UiContext.IsSSTPopupGetoond := false; + UiContext.IsExportPopupGetoond := false; + UiContext.IsBlumXsPopupGetoond := false; + UiContext.InternVhossId := ''; + end else if (UiContext.Modus = modusKAD) then begin + Self.ModalResult := mrDnaCode; + end else if (UiContext.Modus = modusVHOSS) then begin + Self.ModalResult := mrDnaCode; end else begin Self.ModalResult := mrPallet; end; - PostMessage(Self.Handle,WM_Close,0,0); (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); end; @@ -108,7 +115,7 @@ result := false; if (UiContext.MoetTbpCodeGenereren) then begin - result := true; + result := true; end else begin fAgent := TAgent.Create(UiContext); fValideerPalletCodeResponse := fAgent.ValideerPalletCode(edtPallet.Text); @@ -128,15 +135,6 @@ end; end; -procedure TfmPalletScherm.ResetPopups; -begin - UiContext.IsDirecteLeveringPopupGetoond := false; - UiContext.IsWegwerpPalletPopupGetoond := false; - UiContext.IsSSTPopupGetoond := false; - UiContext.IsExportPopupGetoond := false; - UiContext.IsBlumXsPopupGetoond := false; - UiContext.InternVhossId := ''; -end; procedure TfmPalletScherm.btnGenereerTbpClick(Sender: TObject); begin @@ -147,14 +145,6 @@ actVolgendeExecute(Self); end; -procedure TfmPalletScherm.btnOnderdelenClick(Sender: TObject); -begin - inherited; - Self.ModalResult := mrOnderdelen; - PostMessage(Self.Handle,WM_Close,0,0); - (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); -end; - procedure TfmPalletScherm.edtPalletKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState); begin @@ -202,4 +192,3 @@ end; end. - Index: ProScan/UI/DnaCodeScherm.pas =================================================================== diff -u -r682 -r684 --- ProScan/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 682) +++ ProScan/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 684) @@ -314,8 +314,6 @@ procedure TfmDnaCodeScherm.btnInfoClick(Sender: TObject); begin inherited; - UiContext.VanuitOnderdelen := false; - if UiContext.Modus = modusVHOSS then begin UiContext.InfoLogSchermToonGescand := true; Self.ModalResult := mrInfoLog; @@ -602,10 +600,10 @@ ii := 0; if not UiContext.IsExportPopupGetoond then begin - fAgent := TAgent.Create(UiContext); - fBewerkKlantinstellingenResponse := fAgent.BewerkKlantinstellingen('List','',false, false, false, false); - fAgent.Free; try + fAgent := TAgent.Create(UiContext); + fBewerkKlantinstellingenResponse := fAgent.BewerkKlantinstellingen('List','',false, false, false, false); + fAgent.Free; while ii <= length(fBewerkKlantinstellingenResponse.Klantinstellingen)-1 do begin if fBewerkKlantinstellingenResponse.Klantinstellingen[ii].KlantId = DnaCodes[fIndexEersteRelevanteDnaCode].KlantNummer then begin if fBewerkKlantinstellingenResponse.Klantinstellingen[ii].IsExport then begin @@ -625,10 +623,10 @@ ii := 0; if not UiContext.IsBlumXsPopupGetoond then begin - fAgent := TAgent.Create(UiContext); - fBewerkKlantinstellingenResponse := fAgent.BewerkKlantinstellingen('List','',false, false, false, false); - fAgent.Free; try + fAgent := TAgent.Create(UiContext); + fBewerkKlantinstellingenResponse := fAgent.BewerkKlantinstellingen('List','',false, false, false, false); + fAgent.Free; while ii <= length(fBewerkKlantinstellingenResponse.Klantinstellingen)-1 do begin if fBewerkKlantinstellingenResponse.Klantinstellingen[ii].KlantId = DnaCodes[fIndexEersteRelevanteDnaCode].KlantNummer then begin if fBewerkKlantinstellingenResponse.Klantinstellingen[ii].IsBlumXs then begin Index: ProScan/UI/DnaCodeScherm.dfm =================================================================== diff -u -r682 -r684 --- ProScan/UI/DnaCodeScherm.dfm (.../DnaCodeScherm.dfm) (revision 682) +++ ProScan/UI/DnaCodeScherm.dfm (.../DnaCodeScherm.dfm) (revision 684) @@ -2,6 +2,8 @@ ActiveControl = edtDnaCode Caption = 'fmDnaCodeScherm' OnActivate = FormActivate + ExplicitWidth = 480 + ExplicitHeight = 640 PixelsPerInch = 96 TextHeight = 19 object lblToeleveringData: TLabel [0] Index: ProScan/ProScan.identcache =================================================================== diff -u -r676 -r684 Binary files differ