Browse Source

原报或审批人上传后再改标段名,导致线上跟文件包中的记忆不一致,本地接收后出现两个标段。

Chenshilong 7 years ago
parent
commit
398c8e28d9

+ 1 - 1
Dprs/CSL/Measure_Cloud.cfg

@@ -35,7 +35,7 @@
 -N"C:\DelphiTemp"
 -LE"c:\program files (x86)\borland\delphi7\Projects\Bpl"
 -LN"c:\program files (x86)\borland\delphi7\Projects\Bpl"
--D_mCloud;_mEncrypt1;_Test;_mLoginNoPW1
+-D_mCloud;_mEncrypt1;_Test;_mLoginNoPW
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE
 -w-UNSAFE_CAST

+ 14 - 5
Dprs/CSL/Measure_Cloud.dof

@@ -96,12 +96,12 @@ PackageDLLOutputDir=
 PackageDCPOutputDir=
 SearchPath=
 Packages=vcl;rtl;vclx;indy;inet;xmlrtl;vclie;inetdbbde;inetdbxpress;dbrtl;dsnap;dsnapcon;vcldb;soaprtl;VclSmp;dbexpress;dbxcds;inetdb;bdertl;vcldbx;webdsnap;websnap;adortl;ibxpress;teeui;teedb;tee;dss;visualclx;visualdbclx;vclactnband;vclshlctrls;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL;dclOfficeXP;ZjGridD7;DPanel;ExTree;JimComboBoxs;JimTab;PrintComRep;XPMenu_tom;ZjGridFereD7;ZjCommon;SmartDataSet;ZjGridActns
-Conditionals=_mCloud;_mEncrypt1;_Test;_mLoginNoPW1
+Conditionals=_mCloud;_mEncrypt1;_Test;_mLoginNoPW
 DebugSourceDirs=
 UsePackages=0
 [Parameters]
-RunParams=
-HostApplication=
+RunParams=Measure:ww2zsx
+HostApplication=C:\Program Files (x86)\李뷘흡숭\셕좆連마 (데샙경+暾경) 1\Measure_Cloud.exe
 Launcher=
 UseLauncher=0
 DebugCWD=
@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=3
-Build=1141
+Build=1143
 Debug=0
 PreRelease=0
 Special=0
@@ -126,19 +126,28 @@ CodePage=936
 [Version Info Keys]
 CompanyName=瀧베李뷘눼劤흡숭唐掘무鱇
 FileDescription=李뷘써炬엄炬셕좆寧竟뺏暾경
-FileVersion=3.1.3.1141
+FileVersion=3.1.3.1143
 InternalName=
 LegalCopyright=
 LegalTrademarks=
 OriginalFilename=
 ProductName=
 ProductVersion=1.0.0.0
+[HistoryLists\hlConditionals]
+Count=1
+Item0=_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

BIN
Dprs/CSL/Measure_Cloud.res


+ 1 - 0
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

+ 13 - 1
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;