Browse Source

汇总,先查看特殊汇总报表,并勾选特殊项目,再查看一般汇总报表报错

MaiXinRong 8 years ago
parent
commit
bc443e61ff
3 changed files with 17 additions and 3 deletions
  1. 5 2
      ProjGather/ProjGatherSelectFrm.pas
  2. 7 0
      Units/Connections.pas
  3. 5 1
      Units/ProjectData.pas

+ 5 - 2
ProjGather/ProjGatherSelectFrm.pas

@@ -289,8 +289,11 @@ begin
   begin
     vGatherProjInfo := TGatherProjInfo(AProjs.Items[i]);
     FSelectProjs.Add(Pointer(vGatherProjInfo.ProjectID));
-    if (vGatherProjInfo.ProjType > 0) and (vGatherProjInfo.ProjType <= FSpecialProjTypes.Count) then
-      FSpecialProjIDs[vGatherProjInfo.ProjType-1] := vGatherProjInfo.ProjectID;
+    if Assigned(FSpecialProjTypes) then
+    begin
+      if (vGatherProjInfo.ProjType > 0) and (vGatherProjInfo.ProjType <= FSpecialProjTypes.Count) then
+        FSpecialProjIDs[vGatherProjInfo.ProjType-1] := vGatherProjInfo.ProjectID;
+    end;
   end;
 end;
 

+ 7 - 0
Units/Connections.pas

@@ -78,6 +78,7 @@ type
     function CheckFileEncrypt(AFileName: string): Boolean; overload;
     function GetNeedUpdate: Boolean;
     function GetOverExe: Boolean;
+    function GetFileVersion: string;
   public
     destructor Destroy; override;
     procedure Open(const AFileName: string); override;
@@ -89,6 +90,7 @@ type
 
     property NeedUpdate: Boolean read GetNeedUpdate;
     property OverExe: Boolean read GetOverExe;
+    property CurFileVersion: string read GetFileVersion;
   end;
 
   procedure SimpleDecrypt(const ASourceFile, AResultFile: string);
@@ -500,6 +502,11 @@ begin
   
 end;
 
+function TEncryptConnection.GetFileVersion: string;
+begin
+  Result := Trim(FFileHead.FileVersion);
+end;
+
 { TConnection }
 
 procedure TConnection.Close;

+ 5 - 1
Units/ProjectData.pas

@@ -576,9 +576,13 @@ begin
 end;
 
 procedure TProjectData.UpdateProjectDataBase;
+const
+  sHint = '标段文件(%s)高于当前软件支持:' + #13#10 +
+          '专业版:请升级软件;' + #13#10 +
+          '云版:请联系纵横客服,确认是否可升级软件。';
 begin
   if TEncryptConnection(FConnection).OverExe then
-    WarningMessage('标段版本高于当前软件版本,可能会产生错误。');
+    WarningMessage(Format(sHint, [TEncryptConnection(FConnection).CurFileVersion]));
   FUpdator.Update(FConnection);
 end;