MaiXinRong 8 anos atrás
pai
commit
50ef489e6f
4 arquivos alterados com 24 adições e 24 exclusões
  1. 3 3
      Forms/ReportsFrm.pas
  2. 1 1
      Units/CompactDB.pas
  3. 18 18
      Units/Connections.pas
  4. 2 2
      Units/ExportExcel.pas

+ 3 - 3
Forms/ReportsFrm.pas

@@ -674,14 +674,14 @@ procedure TReportsForm.tbImportSrtClick(Sender: TObject);
     sNewFileName := GetReportTemplatePath + ExtractFileName(AFileName);
     if not FileExists(sNewFileName) then
     begin
-      CopyFile(PChar(AFileName), PChar(sNewFileName), True);
+      CopyFileOrFolder(AFileName, sNewFileName);
       vTemplateNode := ReportTemplateManager.AddReportTemplate(sNewFileName);
       AddReportTemplate(vTemplateNode);
     end
     else
       if QuestMessage('已存在报表模板' + ExtractFileName(AFileName) + ',是否覆盖原模板?', Handle) then
       begin
-        CopyFile(PChar(AFileName), PChar(sNewFileName), False);
+        CopyFileOrFolder(AFileName, sNewFileName);
         vTemplateNode := ReportTemplateManager.FindTemplate(sNewFileName);
         if Assigned(vTemplateNode) then
           vTemplateNode.RefreshTemplateProperties;
@@ -731,7 +731,7 @@ begin
   if SaveFile(sFileName, '.srt') then
   begin
     if not FileExists(sFileName) or QuestMessage('存在同名文件,是否覆盖?', Handle) then
-      CopyFile(PChar(vTemplateNode.FileName), PChar(sFileName), False);
+      CopyFileOrFolder(vTemplateNode.FileName, sFileName);
   end;
 end;
 

+ 1 - 1
Units/CompactDB.pas

@@ -80,7 +80,7 @@ begin
     vJE.CompactDatabase(Format(SConnectStr, [AFileName, 'Admin', '']),
         Format(SConnectStr, [strTempFileName, 'Admin', '']));
     vJE := Unassigned;
-    Result := CopyFile(PChar(strTempFileName), PChar(AFileName), False);
+    Result := CopyFileOrFolder(strTempFileName, AFileName);
     DeleteFile(strTempFileName);
   except
     vJE := Unassigned;

+ 18 - 18
Units/Connections.pas

@@ -3,7 +3,7 @@ unit Connections;
 interface
 
 uses
-  ADODB, SysUtils, Classes, ZHAPI, Windows;
+  ADODB, SysUtils, Classes, ZhAPI, Windows;
 
 const
   ProductName = 'Measure';
@@ -129,7 +129,7 @@ procedure SimpleDecrypt(const ASourceFile, AResultFile: string);
         FileStream.Free;
         FileStreamTemp.Free;
       end;
-      CopyFile(PChar(sTempFile), PChar(AFileName), False);
+      CopyFileOrFolder(sTempFile, AFileName);
     finally
       DeleteFile(PChar(sTempFile));
     end;
@@ -141,7 +141,7 @@ procedure SimpleDecrypt(const ASourceFile, AResultFile: string);
     FileStream: TFileStream;
   begin
     sTempFile := ExtractFilePath(AFileName) + ExtractSimpleFileName(AFileName) + '.tmp';
-    CopyFile(PChar(AFileName), PChar(sTempFile), False);
+    CopyFileOrFolder(AFileName, sTempFile);
     try
       if FileExists(sTempFile) then
       begin
@@ -152,7 +152,7 @@ procedure SimpleDecrypt(const ASourceFile, AResultFile: string);
         finally
           FileStream.Free;
         end;
-        CopyFile(PChar(sTempFile), PChar(AFileName), False);
+        CopyFileOrFolder(sTempFile, AFileName);
         DeleteFile(PChar(sTempFile));
       end;
     except
@@ -166,7 +166,7 @@ begin
   if not FileExists(ASourceFile) then Exit;
   try
     sTempFile := GetTempFileName;
-    CopyFile(PChar(ASourceFile), PChar(sTempFile), False);
+    CopyFileOrFolder(ASourceFile, sTempFile);
     RemoveHead(sTempFile);
     AutoDecryptFile(sTempFile, AResultFile);
     RecoverFileHead(AResultFile);
@@ -226,7 +226,7 @@ begin
   begin
     sTempFile := GetTempFileName;
     sEncryptFile := GetTempFileName;
-    CopyFile(PChar(FFileName), PChar(sTempFile), False);
+    CopyFileOrFolder(FFileName, sTempFile);
     try
       AutoEncryptFile(sTempFile, sEncryptFile);
       RefreshFileHead;
@@ -235,7 +235,7 @@ begin
       if CheckFileValid(sEncryptFile) then
       begin
         AppendLog('Check File-E --> Pass');
-        CopyFile(PChar(sEncryptFile), PChar(FOrgFile), False);
+        CopyFileOrFolder(sEncryptFile, FOrgFile);
       end
       else
       begin
@@ -282,7 +282,7 @@ var
   FileStream: TFileStream;
 begin
   sTempFile := ExtractFilePath(AFileName) + ExtractSimpleFileName(AFileName) + '.tmp';
-  CopyFile(PChar(AFileName), PChar(sTempFile), False);
+  CopyFileOrFolder(AFileName, sTempFile);
   try
     if FileExists(sTempFile) then
     begin
@@ -293,7 +293,7 @@ begin
       finally
         FileStream.Free;
       end;
-      CopyFile(PChar(sTempFile), PChar(AFileName), False);
+      CopyFileOrFolder(sTempFile, AFileName);
       DeleteFile(PChar(sTempFile));
     end;
   except
@@ -320,7 +320,7 @@ begin
         FileStream.Free;
         FileStreamTemp.Free;
       end;
-      CopyFile(PChar(sTempFile), PChar(AFileName), False);
+      CopyFileOrFolder(sTempFile, AFileName);
       DeleteFile(PChar(sTempFile));
     except
       DeleteFile(PChar(sTempFile))
@@ -347,7 +347,7 @@ begin
         FileStream.Free;
         FileStreamTemp.Free;
       end;
-      CopyFile(PChar(sTempFile), PChar(AFileName), False);
+      CopyFileOrFolder(sTempFile, AFileName);
       DeleteFile(PChar(sTempFile));
     except
       DeleteFile(PChar(sTempFile))
@@ -364,7 +364,7 @@ begin
   sTempFile := GetTempFileName;
   if FileExists(AFileName) then
   begin
-    CopyFile(PChar(AFileName), PChar(sTempFile), False);
+    CopyFileOrFolder(AFileName, sTempFile);
     if CheckFileEncrypt(sTempFile) then
     begin
       ReadAndRemoveHead(sTempFile);
@@ -373,7 +373,7 @@ begin
     else
     begin
       ResetFileHead;
-      CopyFile(PChar(sTempFile), PChar(sConnectFile), False);
+      CopyFileOrFolder(sTempFile, sConnectFile);
     end;
     DecryptFile(sConnectFile);
     DeleteFile(PChar(sTempFile));
@@ -440,7 +440,7 @@ var
   FileStream: TFileStream;
 begin
   sTempFile := ExtractFilePath(AFileName) + ExtractSimpleFileName(AFileName) + '.tmp';
-  CopyFile(PChar(AFileName), PChar(sTempFile), False);
+  CopyFileOrFolder(AFileName, sTempFile);
   try
     if FileExists(sTempFile) then
     begin
@@ -451,7 +451,7 @@ begin
       finally
         FileStream.Free;
       end;
-      CopyFile(PChar(sTempFile), PChar(AFileName), False);
+      CopyFileOrFolder(sTempFile, AFileName);
       DeleteFile(PChar(sTempFile));
     end;
   except
@@ -471,7 +471,7 @@ end;
 
 procedure TEncryptConnection.SaveDebugFile(const AFileName: string);
 begin
-  CopyFile(PChar(FFileName), PChar(AFileName), False);
+  CopyFileOrFolder(FFileName, AFileName);
   RecoverFileHead(AFileName);
 end;
 
@@ -489,14 +489,14 @@ begin
   try
     if FileExists(AFileName) then
     begin
-      CopyFile(PChar(AFileName), PChar(sTempFile), False);
+      CopyFileOrFolder(AFileName, sTempFile);
       if CheckFileEncrypt(sTempFile) then
       begin
         ReadAndRemoveHead(sTempFile);
         AutoDecryptFile(sTempFile, sConnectFile);
       end
       else
-        CopyFile(PChar(sTempFile), PChar(sConnectFile), False);
+        CopyFileOrFolder(sTempFile, sConnectFile);
       RecoverFileHead(sConnectFile);
       vCon.ConnectionString := Format(SAdoConnectStr, [sConnectFile]);
       vCon.Open;

+ 2 - 2
Units/ExportExcel.pas

@@ -183,7 +183,7 @@ begin
     ExportToXlsPage(AGrid, FXlsOutPut.AddPage);
     FXlsOutPut.SaveToFile(FTempFile);
     if not FileExists(FFileName) or QuestMessage('存在同名文件,是否替换?') then
-      CopyFile(PChar(FTempFile), PChar(FFileName), False);
+      CopyFileOrFolder(FTempFile, FFileName);
   finally
     EndExport;
   end;
@@ -323,7 +323,7 @@ begin
     UpdateProgressHint('保存0号台账Excel数据');
     FXlsOutPut.SaveToFile(FTempFile);
     if not FileExists(AFileName) or QuestMessage('存在同名文件,是否替换?') then
-      CopyFile(PChar(FTempFile), PChar(AFileName), False);
+      CopyFileOrFolder(FTempFile, AFileName);
   finally
     EndExport;
   end;