Merge branch 'master' of http://192.168.1.12:3000/maixinrong/measure

Units/ProjectCommands.pas

@@ -1219,7 +1219,7 @@ end;
 
 function TTenderZipCompleteChecker.CheckLastPhase: Boolean;
 begin
-  Result := Assigned(FProjectData) and FProjectData.CheckPhaseFileComplete;
+  Result := Assigned(FProjectData) and FProjectData.CheckLastPhaseFileExist;
 end;
 
 function TTenderZipCompleteChecker.CheckMain: Boolean;

Units/ProjectData.pas

@@ -531,8 +531,6 @@ begin
     FConnection.Save;
     UpdateSysProgress(190, 'ÕýÔÚ±£´æÊý¾Ý');
 
-    DeleteFileOrFolder(MainFileName);
-
     ZipFolder(FTempFolder, FileName);
     SaveInfoToManager;
     UpdateSysProgress(200, '¾ÍÐ÷');
@@ -2146,7 +2144,10 @@ end;
 
 function TProjectData.CheckLastPhaseFileExist: Boolean;
 begin
-  Result := FileExists(Format('%s\Phase%d.dat', [TempPath, FProjProperties.PhaseCount]));
+  if FProjProperties.PhaseCount > 0 then
+    Result := FileExists(Format('%s\Phase%d.dat', [TempPath, FProjProperties.PhaseCount]))
+  else
+    Result := True;
 end;
 
 end.