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

DataModules/ProjectManagerDm.dfm

@@ -106,7 +106,10 @@ object ProjectManagerData: TProjectManagerData
       01044E616D65060C4465616C5061794469676974094669656C644E616D65060C
       4465616C50617944696769740844617461547970650203084461746153697A65
       02040549734B6579080F4E65656450726F636573734E616D6509095072656369
-      73696F6E02000453697A6502000000}
+      73696F6E02000453697A6502000001044E616D65060C5765624D65576F726B69
+      6E67094669656C644E616D65060C5765624D65576F726B696E67084461746154
+      7970650205084461746153697A6502010549734B6579080F4E65656450726F63
+      6573734E616D650909507265636973696F6E02000453697A6502000000}
   end
   object sdvProjectsInfo: TsdDataView
     Active = False
@@ -187,6 +190,9 @@ object ProjectManagerData: TProjectManagerData
       end
       item
         FieldName = 'WebKey'
+      end
+      item
+        FieldName = 'WebMeWorking'
       end>
     BeforeDeleteRecord = sdvProjectsInfoBeforeDeleteRecord
     OnFilterRecord = sdvProjectsInfoFilterRecord

Dprs/CSL/Measure_Cloud.dof

@@ -111,11 +111,11 @@ ProjectLang=
 RootDir=D:\Program Files\Borland\Delphi7\Bin\
 [Version Info]
 IncludeVerInfo=1
-AutoIncBuild=1
+AutoIncBuild=0
 MajorVer=3
-MinorVer=4
-Release=1
-Build=1004
+MinorVer=1
+Release=7
+Build=2246
 Debug=0
 PreRelease=0
 Special=0
@@ -126,13 +126,15 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化云版
-FileVersion=3.4.1.1004
+FileVersion=3.1.7.2246
 InternalName=
 LegalCopyright=
 LegalTrademarks=
 OriginalFilename=
 ProductName=
 ProductVersion=1.0.0.0
+[Excluded Packages]
+c:\program files (x86)\borland\delphi7\Bin\DBWEBXPRT.BPL=Borland Web Wizard Package
 [HistoryLists\hlConditionals]
 Count=2
 Item0=_mCloud;_mEncrypt1;_Test;_mLoginNoPW1

Dprs/Pro/Measure_GuangDong_Cloud.cfg

@@ -31,8 +31,8 @@
 -M
 -$M16384,1048576
 -K$00400000
--E"D:\SmartCostExe\Measure"
--N"..\..\Dcus"
+-E"C:\Program Files (x86)\纵横软件\纵横结算决算计量一体化软件(广东云版)"
+-N"C:\DelphiTemp"
 -LE"c:\program files (x86)\borland\delphi7\Projects\Bpl"
 -LN"c:\program files (x86)\borland\delphi7\Projects\Bpl"
 -D_mCloud;_mGuangDong

Dprs/Pro/Measure_GuangDong_Cloud.dof

@@ -90,8 +90,8 @@ MaxStackSize=1048576
 ImageBase=4194304
 ExeDescription=
 [Directories]
-OutputDir=D:\SmartCostExe\Measure
-UnitOutputDir=..\..\Dcus
+OutputDir=C:\Program Files (x86)\纵横软件\纵横结算决算计量一体化软件(广东云版)
+UnitOutputDir=C:\DelphiTemp
 PackageDLLOutputDir=
 PackageDCPOutputDir=
 SearchPath=
@@ -111,11 +111,11 @@ ProjectLang=
 RootDir=D:\Program Files\Borland\Delphi7\Bin\
 [Version Info]
 IncludeVerInfo=1
-AutoIncBuild=1
+AutoIncBuild=0
 MajorVer=3
 MinorVer=1
 Release=7
-Build=2247
+Build=2246
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化广东云版
-FileVersion=3.1.7.2247
+FileVersion=3.1.7.2246
 InternalName=
 LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
 LegalTrademarks=Measure
@@ -134,8 +134,7 @@ OriginalFilename=
 ProductName=纵横公路工程结算决算一体化软件
 ProductVersion=3.1.7.1
 [Excluded Packages]
-C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxEditorsVCLD7.bpl=ExpressEditors Library 5 (VCL Edition) by Developer Express Inc.
-C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxExtEditorsVCLD7.bpl=ExpressExtendedEditors Library 5 (VCL Edition) by Developer Express Inc.
+c:\program files (x86)\borland\delphi7\Bin\DBWEBXPRT.BPL=Borland Web Wizard Package
 [HistoryLists\hlConditionals]
 Count=1
 Item0=_mCloud;_mGuangDong
@@ -143,8 +142,10 @@ Item0=_mCloud;_mGuangDong
 Count=1
 Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
 [HistoryLists\hlUnitOutputDirectory]
-Count=1
-Item0=..\..\Dcus
+Count=2
+Item0=C:\DelphiTemp
+Item1=..\..\Dcus
 [HistoryLists\hlOutputDirectorry]
-Count=1
-Item0=D:\SmartCostExe\Measure
+Count=2
+Item0=C:\Program Files (x86)\纵横软件\纵横结算决算计量一体化软件(广东云版)
+Item1=D:\SmartCostExe\Measure

Dprs/Pro/Measure_GuangDong_Cloud.dpr

@@ -241,7 +241,8 @@ uses
   stgSubGatherFile in '..\..\SubTenderGather\stgSubGatherFile.pas',
   stgSubGatherFileDm in '..\..\SubTenderGather\stgSubGatherFileDm.pas' {stgSubGatherData: TDataModule},
   stgTables in '..\..\SubTenderGather\stgTables.pas',
-  rmZhongKaiDm in '..\..\DataModules\ReportMemoryDm\rmZhongKaiDm.pas' {rmZhongKaiData: TDataModule};
+  rmZhongKaiDm in '..\..\DataModules\ReportMemoryDm\rmZhongKaiDm.pas' {rmZhongKaiData: TDataModule},
+  MScrollBox in '..\..\..\SmartCost\Components\MBaseControl\Source\MScrollBox.pas';
 
 {$R *.res}
 

Forms/LoginFrm.pas

@@ -165,8 +165,8 @@ begin
 
   if G_IsTest then
   begin
-    cbUser.Text := '1971614655@qq.com';
-    edtPW.Text := '3850888';
+    cbUser.Text := '1014149875@qq.com';
+    edtPW.Text := '123456';
   end;
 end;
 

Frames/ProjectFme.pas

@@ -1084,6 +1084,7 @@ begin
           vRec.ValueByName('WebMD5').AsString := sMD5_JL;
           if ProjectData.CurUserIsOwner then
             vRec.ValueByName('AuditStatus').AsInteger := -1;
+          vRec.ValueByName('WebMeWorking').AsBoolean := False;
           vRec.EndUpdate;
           MainForm.ProjectManagerFrame.ShowProjectInfoTop;
 

Frames/ProjectManagerFme.pas

@@ -144,7 +144,7 @@ type
     FSignOnlineSwitch: Integer;
     FEpureOnlineSwitch: Integer;
 
-    function ReceiveFile(const AFileName: string; AIsReback: Boolean = False): Boolean;
+    function ReceiveFile(const AFileName: string; AIsReback: Boolean = False; AWorking: Boolean = False): Boolean;
     function ImportFile(const AFileName: string; AFileMD5: string = ''): Boolean;
     procedure ConnectButtonWithAction;
     function GetImportProjectName(const AFileName: string; AParent: TsdIDTreeNode): string;
@@ -169,7 +169,7 @@ type
     function LocalMD5(AUserID, AWebID: Integer): string;
     procedure BubbleSortProjects;
     // AReceiveKind: 1 接收； 2 导入
-    function FileDownAndReceive(ADownURL: string; AReceiveKind: Integer): Boolean;
+    function FileDownAndReceive(ADownURL: string; AReceiveKind: Integer; AWorking: Boolean = false): Boolean;
     // 线上审批的起止人
     procedure OnLineChecker(AAr: TOVArr; var ABegin, AEnd: Integer; var AOnLineEndIsOwner: Boolean);
 
@@ -457,7 +457,7 @@ begin
   end;
 end;
 
-function TProjectManagerFrame.ReceiveFile(const AFileName: string; AIsReback: Boolean): Boolean;
+function TProjectManagerFrame.ReceiveFile(const AFileName: string; AIsReback: Boolean; AWorking: Boolean): Boolean;
 var
   vRP: TReceiveProject;
   vNode: TsdIDTreeNode;
@@ -480,6 +480,7 @@ begin
         vNode.Rec.BeginUpdate;
         vNode.Rec.ValueByName('WebMD5').AsString := FWebMD5_OnLine;
         vNode.Rec.ValueByName('WebUserID').AsInteger := PHPWeb.UserID;
+        vNode.Rec.ValueByName('WebMeWorking').AsBoolean := AWorking;
         vNode.Rec.EndUpdate;
       end;
     end
@@ -1362,7 +1363,7 @@ begin
               FOnLineCheckerEnd := 0;
             end;
 
-            if not FileDownAndReceive(sURL, 1) then Exit;
+            if not FileDownAndReceive(sURL, 1, (FWebCheckStatusMy = csChecking)) then Exit;
           end;
         end;
 
@@ -1750,7 +1751,7 @@ begin
   end;
 end;
 
-function TProjectManagerFrame.FileDownAndReceive(ADownURL: string; AReceiveKind: Integer): Boolean;
+function TProjectManagerFrame.FileDownAndReceive(ADownURL: string; AReceiveKind: Integer; AWorking: Boolean): Boolean;
 var sLocalFile, sHint: string;
   bCanImp: Boolean;
   vFileCheck: TTenderFileChecker;
@@ -1795,7 +1796,7 @@ begin
   end;
 
   // 接收更新
-  if not ReceiveFile(sLocalFile, (AReceiveKind = 2)) then
+  if not ReceiveFile(sLocalFile, (AReceiveKind = 2), AWorking) then
   begin
     sHint := Format('已从云端下载新的 [%s] 到本地 [%s]，但接收失败，请删除该项目然后重新从云端获取！', [FWebBidName_OnLine, sLocalFile]);
     Application.MessageBox(PChar(sHint), '系统提醒', MB_OK + MB_ICONWARNING);
@@ -2038,14 +2039,19 @@ var
   value: String;
   pc: Integer;
 begin
+  vItem := stdProjects.IDTree.Items[ACoord.Y - zgProjects.FixedRowCount];
   if ACoord.X = 11 then
   begin
-    vItem := stdProjects.IDTree.Items[ACoord.Y - zgProjects.FixedRowCount];
     value := vItem.Rec.ValueByName('AuditStatus').asString;
     pc := vItem.Rec.ValueByName('PhaseCount').AsInteger;
     if (value = '-1') and (pc <> 0) then
       AColor := TColor($00daedd4);
   end;
+
+  if vItem.Rec.ValueByName('WebMeWorking').AsBoolean then
+  begin
+    AColor := TColor($000099FF);
+  end;
 end;
 
 procedure TProjectManagerFrame.zgProjectsCellGetFont(Sender: TObject;

Units/DataBaseTables.pas

@@ -38,7 +38,7 @@ const
   {ProjectManagerData}
   {项目管理}
   SProjectsInfo = 'ProjectsInfo';
-  tdProjectsInfo: array [0..26] of TScFieldDef =(
+  tdProjectsInfo: array [0..27] of TScFieldDef =(
     (FieldName: 'ID'; FieldType: ftInteger; Size: 0; Precision: 0; NotNull: True; PrimaryKey: True; ForceUpdate: False),
     (FieldName: 'ParentID'; FieldType: ftInteger; Size: 0; Precision: 0; NotNull: True; PrimaryKey: False; ForceUpdate: False),
     (FieldName: 'NextSiblingID'; FieldType: ftInteger; Size: 0; Precision: 0; NotNull: True; PrimaryKey: False; ForceUpdate: False),
@@ -80,6 +80,8 @@ const
     (FieldName: 'WebAuthorID'; FieldType: ftInteger; Size: 0; Precision: 0; NotNull: False; PrimaryKey: False; ForceUpdate: False),
     // 文件的MD5码
     (FieldName: 'WebMD5'; FieldType: ftString; Size: 255; Precision: 0; NotNull: False; PrimaryKey: False; ForceUpdate: False),
+    // 轮到我干活
+    (FieldName: 'WebMeWorking'; FieldType: ftBoolean; Size: 0; Precision: 0; NotNull: False; PrimaryKey: False; ForceUpdate: False),
     // 文件下载到本地，该字段填上当前用户的ID，用来标识该文件只属于这个用户。多用户使用同一台电脑时，靠这个字段过滤出自己的文件……
     (FieldName: 'WebUserID'; FieldType: ftInteger; Size: 0; Precision: 0; NotNull: False; PrimaryKey: False; ForceUpdate: False),
     // 网络文件夹层次。本地结点是一张表存放的树结构。但服务器上，三层结点分成三张表存放，传到本地合并后ID会重复。所以加多一个字段进行区分。