--- dao/DelphiScanner/Main.pas 2015/08/27 12:31:30 2685
+++ dao/DelphiScanner/Main.pas 2015/09/03 14:27:21 2693
@@ -52,7 +52,7 @@
Testlyd1: TMenuItem;
ListBox1: TListBox;
Budlevering1: TMenuItem;
- DownloadButton01: TButton;
+ BtnDownloadKontrolfil: TButton;
IdFTP1: TIdFTP;
Image1: TImage;
ListBox2: TListBox;
@@ -93,9 +93,6 @@
PanelManglendePakker6: TPanel;
menuIndlevering: TMenuItem;
-
- function Sto_GetFmtFileVersion(const FileName: String = ''): String;
-
function getProddato() : TDate;
function getProddag() : String;
function retRutenummer(rutenummer : String) : String;
@@ -134,7 +131,7 @@
procedure Button1Click(Sender: TObject);
procedure ListBox1DrawItem(Control: TWinControl; Index: Integer; Rect: TRect; State: TOwnerDrawState);
procedure Budlevering1Click(Sender: TObject);
- procedure DownloadButton01Click(Sender: TObject);
+ procedure BtnDownloadKontrolfilClick(Sender: TObject);
procedure OpdaterListenButton01Click(Sender: TObject);
procedure DownloadBladhusRuteskiftfil();
procedure DownloadBladhusKontrolfil();
@@ -193,7 +190,7 @@
SkrivLog : String;
Sted : String;
StedNavn : String;
- Url, UrlNormal, UrlReturDAO, UrlReturBoghandler, UrlBudlevering, UrlManglendeScanninger, UrlPakkeshoplevering, UrlReturPakkeshop, UrlPakkeshopManglendeScanninger, UrlPakkeshopManglendeReturScanninger,UrlIndleveringsPakke,UrlEKLoverforsel : String;
+ Url, UrlNormal, UrlReturDAO, UrlReturBoghandler, UrlBudlevering, UrlManglendeScanninger, UrlPakkeshoplevering, UrlReturPakkeshop, UrlPakkeshopManglendeScanninger, UrlPakkeshopManglendeReturScanninger,UrlIndleveringsPakke,UrlIndleveringsPakkeManglendeScanninger,UrlEKLoverforsel : String;
// 29150330: start
UrlEKLoverforselPakkeshop : String;
// 20150330: slut
@@ -562,7 +559,10 @@
UrlPakkeshopManglendeScanninger := ReadString('Settings','UrlPakkeshopManglendeScanninger','http://omdeling.info/webservices/pakkeshop/pakkemanglendescanninger.php?sted=%s');
UrlPakkeshopManglendeReturScanninger := ReadString('Settings','UrlPakkeshopManglendeReturScanninger','http://omdeling.info/webservices/pakkeshop/pakkemanglendereturscanninger.php?sted=%s');
+
UrlIndleveringsPakke := ReadString('Settings','UrlIndleveringsPakke','http://omdeling.info/webservices/pakkeshop/PakkekontrolIndleveringskode.php?sted=%s&pakkekode=%s');
+ UrlIndleveringsPakkeManglendeScanninger := ReadString('Settings', 'UrlIndleveringsPakkeManglendeScanninger','http://omdeling.info/webservices/pakkeshop/IndleveringsPakkeManglendeScanninger.php?sted=%s');
+
LabelType := ReadInteger('Settings','LabelType',1);
@@ -602,7 +602,7 @@
if (SkrivLog = '1') then
begin
- logTekst := 'Program start (Version: ' + Sto_GetFmtFileVersion('') + ') Dato: ' + FormatDateTime('yyyy-mm-dd hh:nn:ss',now);
+ logTekst := 'Program start (Version: ' + TUtils.Sto_GetFmtFileVersion('') + ') Dato: ' + FormatDateTime('yyyy-mm-dd hh:nn:ss',now);
try
SkrivScanningLogFil(logTekst);
Uploadlogfil1.Enabled := true;
@@ -1128,7 +1128,7 @@
Scanningtype := gemScanningtype;
SendInfoTilServer(Sted, Scanningtype, 'Begin', '');
- SendInfoTilServer(Sted, Scanningtype, 'ProgramVersion', Sto_GetFmtFileVersion(''));
+ SendInfoTilServer(Sted, Scanningtype, 'ProgramVersion', TUtils.Sto_GetFmtFileVersion(''));
end;
@@ -1977,7 +1977,7 @@
01 :
begin; // NS
Testprinter1.Visible := true;
- DownloadButton01.Enabled := true;
+ BtnDownloadKontrolfil.Enabled := true;
OpdaterListenButton01.Enabled := true;
IdFTP1.Passive := true;
IdFTP1.PassiveUseControlHost := true;
@@ -1993,7 +1993,7 @@
Storepakker1.Enabled := true;
radioStorPakke.Enabled := true;
radioLillePakke.Enabled := true;
- DownloadButton01.Enabled := false; // kontrolfil bruges ikke her
+ BtnDownloadKontrolfil.Enabled := false; // kontrolfil bruges ikke her
OpdaterListenButton01.Enabled := true;
IdFTP1.Passive := true;
IdFTP1.PassiveUseControlHost := true;
@@ -2010,7 +2010,7 @@
begin
DownloadButton03.Visible := false;
end;
- DownloadButton01.Enabled := true;
+ BtnDownloadKontrolfil.Enabled := true;
OpdaterListenButton01.Enabled := true;
IdFTP1.Passive := true;
IdFTP1.PassiveUseControlHost := true;
@@ -2031,7 +2031,7 @@
Storepakker1.Enabled := true;
radioStorPakke.Enabled := true;
radioLillePakke.Enabled := true;
- DownloadButton01.Enabled := false; // kontrolfil bruges ikke her
+ BtnDownloadKontrolfil.Enabled := false; // kontrolfil bruges ikke her
OpdaterListenButton01.Enabled := true;
IdFTP1.Passive := true;
IdFTP1.PassiveUseControlHost := true;
@@ -2906,6 +2906,58 @@
end;
end;
+ // Tjekker UrlIndleveringsPakke og UrlIndleveringsPakkeManglendeScanninger
+ if PanelValg7.Enabled = true then
+ begin
+ if CheckUrl(UrlIndleveringsPakke) then
+ begin
+ logTekst := 'UrlIndleveringsPakke accepteret: ' + UrlIndleveringsPakke;
+ SkrivScanningLogFil(logTekst);
+ end
+ else
+ begin
+ inc(urlFejl); // Optæller antal fejl
+ logTekst := 'UrlIndleveringsPakke svarer ikke: ' + UrlIndleveringsPakke;
+ ListBox1.Items.Insert(0,TimeToStr(now) + ': ' + logTekst);
+ if TjekUrls = '1' then
+ begin
+ logTekst := logTekst + crlf + crlf + 'Programmet afsluttes... ';
+ end;
+ SkrivScanningLogFil(logTekst);
+ if TjekUrls = '1' then
+ begin
+ ShowMessage(logTekst);
+ UrlSendPrograminfo := ''; // Her sletter vi lige url, så der ikke forsøges at sende besked ved program slut
+ Application.Terminate;
+ exit;
+ end;
+ end;
+
+ if CheckUrl(UrlIndleveringsPakkeManglendeScanninger) then
+ begin
+ logTekst := 'UrlIndleveringsPakkeManglendeScanninger accepteret: ' + UrlIndleveringsPakkeManglendeScanninger;
+ SkrivScanningLogFil(logTekst);
+ end
+ else
+ begin
+ inc(urlFejl); // Optæller antal fejl
+ logTekst := 'UrlIndleveringsPakkeManglendeScanninger svarer ikke: ' + UrlIndleveringsPakkeManglendeScanninger;
+ ListBox1.Items.Insert(0,TimeToStr(now) + ': ' + logTekst);
+ if TjekUrls = '1' then
+ begin
+ logTekst := logTekst + crlf + crlf + 'Programmet afsluttes... ';
+ end;
+ SkrivScanningLogFil(logTekst);
+ if TjekUrls = '1' then
+ begin
+ ShowMessage(logTekst);
+ UrlSendPrograminfo := ''; // Her sletter vi lige url, så der ikke forsøges at sende besked ved program slut
+ Application.Terminate;
+ exit;
+ end;
+ end;
+ end;
+
// Tjekker UrlEKLoverforsel
if PanelValg1.Enabled = true then
begin
@@ -3189,27 +3241,14 @@
procedure TMainForm.PanelValgAClick(Sender: TObject);
begin
-// 20150311: start
-(*
- if PanelValgA.Color = clBtnFace then
- begin
- AutomatiskValg1.Checked := true;
- PanelValgA.Color := clGreen;
- PanelValgA.Font.Color := clWhite;
- end
- else
- begin
- AutomatiskValg1.Checked := false;
- PanelValgA.Color := clBtnFace;
- PanelValgA.Font.Color := clWindowText;
- end;
-*)
// Skal ikke toggle men bare sætte funktionen on
// Fravælges ved at vælge en scanningstype
- AutomatiskValg1.Checked := true;
- PanelValgA.Color := clGreen;
- PanelValgA.Font.Color := clWhite;
-// 20150311: slut
+ AutomatiskValg1.Checked := true;
+ PanelValgA.Color := clGreen;
+ PanelValgA.Font.Color := clWhite;
+
+
+
end;
procedure TMainForm.Pakkernormal1Click(Sender: TObject);
@@ -3324,7 +3363,7 @@
tekst, filversion : String;
begin
- filversion := Sto_GetFmtFileVersion('');
+ filversion := TUtils.Sto_GetFmtFileVersion('');
tekst := 'Program til indscanning af pakker'+crlf+'Version '+filversion+crlf+crlf+'Udviklet af it afdelingen, DAO';
tekst := tekst+crlf+crlf;
@@ -3602,7 +3641,7 @@
radioLillePakke.Enabled := true;
ListBox1.Visible := true;
ListBox1.Items.Clear;
- DownloadButton01.Enabled := false;
+ BtnDownloadKontrolfil.Enabled := false;
OpdaterListenButton01.Enabled := true;
DownloadButton03.Visible := false;
EKLoverforsel.Enabled := false;
@@ -3638,7 +3677,7 @@
radioLillePakke.Enabled := false;
ListBox1.Visible := true;
ListBox1.Items.Clear;
- DownloadButton01.Enabled := false;
+ BtnDownloadKontrolfil.Enabled := false;
OpdaterListenButton01.Enabled := true;
EKLoverforsel.Enabled := true;
@@ -3675,7 +3714,7 @@
radioLillePakke.Enabled := false;
ListBox1.Visible := true;
ListBox1.Items.Clear;
- DownloadButton01.Enabled := false;
+ BtnDownloadKontrolfil.Enabled := false;
OpdaterListenButton01.Enabled := true;
EKLoverforsel.Enabled := false;
InitLillePakke();
@@ -3722,7 +3761,7 @@
ListBox1.Visible := true;
ListBox1.Items.Clear();
- DownloadButton01.Enabled := false;
+ BtnDownloadKontrolfil.Enabled := false;
OpdaterListenButton01.Enabled := true;
EKLoverforsel.Enabled := false;
InitLillePakke();
@@ -3762,60 +3801,7 @@
// 20150310: slut
end;
-///
-/// This function reads the file resource of "FileName" and returns
-/// the version number as formatted text.
-///
-/// Sto_GetFmtFileVersion() = '4.13.128.0'
-/// Sto_GetFmtFileVersion('', '%.2d-%.2d-%.2d') = '04-13-128'
-///
-/// If "Fmt" is invalid, the function may raise an
-/// EConvertError exception.
-/// Full path to exe or dll. If an empty
-/// string is passed, the function uses the filename of the
-/// running exe or dll.
-/// Format string, you can use at most four integer
-/// values.
-/// Formatted version number of file, '' if no version
-/// resource found.
-function TMainForm.Sto_GetFmtFileVersion(const FileName: String = ''): String;
-var
- sFileName: String;
- iBufferSize: DWORD;
- iDummy: DWORD;
- pBuffer: Pointer;
- pFileInfo: Pointer;
- iVer: array[1..4] of Integer;
-begin
- // set default value
- Result := '';
- // get filename of exe/dll if no filename is specified
- sFileName := Trim(FileName);
- if (sFileName = '') then
- sFileName := GetModuleName(HInstance);
- // get size of version info (0 if no version info exists)
- iBufferSize := GetFileVersionInfoSize(PChar(sFileName), iDummy);
- if (iBufferSize > 0) then
- begin
- GetMem(pBuffer, iBufferSize);
- try
- // get fixed file info (language independent)
- GetFileVersionInfo(PChar(sFileName), 0, iBufferSize, pBuffer);
- VerQueryValue(pBuffer, '\', pFileInfo, iDummy);
- // read version blocks
- iVer[1] := HiWord(PVSFixedFileInfo(pFileInfo)^.dwFileVersionMS);
- iVer[2] := LoWord(PVSFixedFileInfo(pFileInfo)^.dwFileVersionMS);
- iVer[3] := HiWord(PVSFixedFileInfo(pFileInfo)^.dwFileVersionLS);
- iVer[4] := LoWord(PVSFixedFileInfo(pFileInfo)^.dwFileVersionLS);
- finally
- FreeMem(pBuffer);
- end;
-
- // format result string
- Result := Format('%d.%d.%d.%d', [iVer[1], iVer[2], iVer[3], iVer[4]]);
- end;
-end;
procedure TMainForm.PlaySound(filename : PWideChar);
begin
@@ -4485,7 +4471,7 @@
ListBox1.SetFocus; // for at flytte fokus væk fra upload knappen så denne ikke aktiveres ved scanning / indtastning af stregkode
end;
-procedure TMainForm.DownloadButton01Click(Sender: TObject);
+procedure TMainForm.BtnDownloadKontrolfilClick(Sender: TObject);
begin
DownloadBladhusKontrolfil();
ListBox1.SetFocus; // for at flytte fokus væk fra download knappen så denne ikke aktiveres ved scanning / indtastning af stregkode
@@ -4668,13 +4654,18 @@
end;
- if (Scanningtype = '6') then
+
+ if (Scanningtype = '7') then
+ begin
+ URLStr := Format(UrlIndleveringsPakkeManglendeScanninger, [StedKode]);
+ end
+ else if (Scanningtype = '6') then
begin
- URLStr := Format(UrlPakkeshopManglendeReturScanninger,[StedKode]);
+ URLStr := Format(UrlPakkeshopManglendeReturScanninger, [StedKode]);
end
else if (Scanningtype = '5') then
begin
- URLStr := Format(UrlPakkeshopManglendeScanninger,[StedKode]);
+ URLStr := Format(UrlPakkeshopManglendeScanninger, [StedKode]);
end
else if (Scanningtype = '1') then
begin