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

DataModules/PHPWebDm.pas

@@ -119,6 +119,7 @@ type
 
     function UrlGet(AUrl: string; APostParam: TStrings; var AResult: string): Integer; overload;
     function UrlGet(AUrl: string; APostParam: TStrings; var AResult: TStrings): Integer; overload;
+    procedure ReadIniValues;
 
     property Account: string read FAccount write SetAccount;
     property UserID: Integer read FUserID write SetUserID;
@@ -215,30 +216,9 @@ begin
 end;
 
 procedure TPHPWeb.DataModuleCreate(Sender: TObject);
-var ini: TIniFile;
 begin
   FServerDateTime := -1;
-
-  ini := TIniFile.Create(ExtractFilePath(Application.ExeName) + 'Cloud.ini');
-  try
-//    FMeasureURL := ini.ReadString('URL', 'MeasureURL', '');
-    FMeasureURL := 'http://' + ini.ReadString('URL', 'Server', '') +
-      ini.ReadString('URL', 'MeasureURL', '');
-    FWebSoftURL := ini.ReadString('URL', 'WebSoftURL', '');
-    FPassportURL := ini.ReadString('URL', 'PassportURL', '');
-    FLoginCloudURL := ini.ReadString('URL', 'LoginCloudURL', '');
-
-    FLoginURL := FWebSoftURL + ini.ReadString('URL', 'LoginURL', '');
-    FWebLoginURL := FWebSoftURL + ini.ReadString('URL', 'FWebLoginURL', '');
-    FLoginBannerURL := FWebSoftURL + ini.ReadString('URL', 'LoginBannerURL', '');
-    FLogoutURL := FWebSoftURL + ini.ReadString('URL', 'LogoutURL', '');
-    FRegURL := FPassportURL + ini.ReadString('URL', 'RegURL', '');
-    FPwdURL := FPassportURL + ini.ReadString('URL', 'PwdURL', '');
-    FCheckOnLineURL := FWebSoftURL + ini.ReadString('URL', 'CheckOnLineURL', '');
-    FServerDateTimeURL := FWebSoftURL + ini.ReadString('URL', 'ServerDateTimeURL', '');
-  finally
-    ini.Free;
-  end;
+  ReadIniValues;
 end;
 
 procedure TPHPWeb.SetRealName(const Value: string);
@@ -969,6 +949,31 @@ begin
   Result := CustomSearch(AURL, [], [], 1, vA, AOutRecords);
 end;
 
+procedure TPHPWeb.ReadIniValues;
+var ini: TIniFile;
+begin
+  ini := TIniFile.Create(ExtractFilePath(Application.ExeName) + 'Cloud.ini');
+  try
+//    FMeasureURL := ini.ReadString('URL', 'MeasureURL', '');
+    FMeasureURL := 'http://' + ini.ReadString('URL', 'Server', '') +
+      ini.ReadString('URL', 'MeasureURL', '');
+    FWebSoftURL := ini.ReadString('URL', 'WebSoftURL', '');
+    FPassportURL := ini.ReadString('URL', 'PassportURL', '');
+    FLoginCloudURL := ini.ReadString('URL', 'LoginCloudURL', '');
+
+    FLoginURL := FWebSoftURL + ini.ReadString('URL', 'LoginURL', '');
+    FWebLoginURL := FWebSoftURL + ini.ReadString('URL', 'FWebLoginURL', '');
+    FLoginBannerURL := FWebSoftURL + ini.ReadString('URL', 'LoginBannerURL', '');
+    FLogoutURL := FWebSoftURL + ini.ReadString('URL', 'LogoutURL', '');
+    FRegURL := FPassportURL + ini.ReadString('URL', 'RegURL', '');
+    FPwdURL := FPassportURL + ini.ReadString('URL', 'PwdURL', '');
+    FCheckOnLineURL := FWebSoftURL + ini.ReadString('URL', 'CheckOnLineURL', '');
+    FServerDateTimeURL := FWebSoftURL + ini.ReadString('URL', 'ServerDateTimeURL', '');
+  finally
+    ini.Free;
+  end;
+end;
+
 initialization
 
 finalization

Dprs/CSL/Measure_Cloud.dof

@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=3
-Build=1141
+Build=1145
 Debug=0
 PreRelease=0
 Special=0
@@ -126,19 +126,29 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化云版
-FileVersion=3.1.3.1141
+FileVersion=3.1.3.1145
 InternalName=
 LegalCopyright=
 LegalTrademarks=
 OriginalFilename=
 ProductName=
 ProductVersion=1.0.0.0
+[HistoryLists\hlConditionals]
+Count=2
+Item0=_mCloud;_mEncrypt1;_Test;_mLoginNoPW1
+Item1=_mCloud;_mEncrypt1;_Test;_mLoginNoPW
 [HistoryLists\hlUnitAliases]
 Count=1
 Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
 [HistoryLists\hlSearchPath]
 Count=1
 Item0=E:\IFP3
+[HistoryLists\hlUnitOutputDirectory]
+Count=1
+Item0=C:\DelphiTemp
+[HistoryLists\hlOutputDirectorry]
+Count=1
+Item0=C:\Program Files (x86)\纵横软件\计量支付 (单机版+云版) 1
 [HistoryLists\hlBPLOutput]
 Count=1
 Item0=E:\SmartCost\Components\LIB

Forms/IPFrm.pas

@@ -85,6 +85,7 @@ begin
     finally
       ini.Free;
     end;
+    PHPWeb.ReadIniValues;
   end
   else
   begin

Frames/ProjectManagerFme.pas

@@ -461,6 +461,7 @@ begin
       vRP.IsReback := AIsReback;
       vRP.Lock := (FWebAuthorID = PHPWeb.UserID) or
            ((FWebAuthorID <> PHPWeb.UserID) and (FWebCheckStatusMy <> csChecking));
+      vRP.WebBidName := FWebBidName_OnLine;
       vNode := vRP.ReceiveForLost(AFileName, FOnLineCheckerBegin, FOnLineCheckerEnd, FOnLineCheckerEndIsOwner);
 
       if vNode <> nil then

Units/ProjectCommands.pas

@@ -104,6 +104,7 @@ type
     FLock: Boolean;
     FMessageID: Integer;
     FIsReback: Boolean;
+    FWebBidName: string;
 
     function CheckOpen: Boolean;
     function GetNewTender: TsdIDTreeNode;
@@ -114,6 +115,7 @@ type
     function CheckUpdateStatusValid: Boolean;
     procedure ReadXmlInfo;
     function UpdateData(const AFileName: string): Boolean;
+    procedure SetWebBidName(const Value: string);
   public
     constructor Create(ASelect: TsdIDTreeNode);
     destructor Destroy; override;
@@ -135,6 +137,8 @@ type
     //       2[接收失败，下载文件跟网页状态不一致]
     //       3[接收失败，升级文件失败]
     property MessageID: Integer read FMessageID;
+    // ProjectName 是标段名。之前是读自文件包中的XML文件属性，现在要从线上取。
+    property WebBidName: string read FWebBidName write SetWebBidName;
   end;
 
   {1. 生成临时文件夹
@@ -635,7 +639,10 @@ begin
   vXmlElement := FXmlDocument.DocumentElement;
   ChildNodes := vXmlElement.ChildNodes;
   vProjInfo := ChildNodes.FindNode('ProjectInfo');
-  FProjectName := vProjInfo.Attributes['ProjectName'];
+  if (G_IsCloud and (FWebBidName <> '')) then
+    FProjectName := FWebBidName
+  else
+    FProjectName := vProjInfo.Attributes['ProjectName'];
   
   GetCurNode;
   // 备份旧文件
@@ -736,6 +743,11 @@ begin
     Result := True;
 end;
 
+procedure TReceiveProject.SetWebBidName(const Value: string);
+begin
+  FWebBidName := Value;
+end;
+
 { TTenderExport }
 
 constructor TTenderExport.Create(ARec: TsdDataRecord;