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

Dprs/CSL/Measure_Cloud.cfg

@@ -31,7 +31,7 @@
 -M
 -$M16384,1048576
 -K$00400000
--E"C:\Program Files (x86)\李뷘흡숭\셕좆連마 (데샙경+暾경) 1"
+-E"C:\Program Files (x86)\李뷘흡숭\李뷘써炬엄炬셕좆寧竟뺏흡숭(暾경)"
 -N"D:\Work\DelphiTemp"
 -LE"c:\program files (x86)\borland\delphi7\Projects\Bpl"
 -LN"c:\program files (x86)\borland\delphi7\Projects\Bpl"

Dprs/CSL/Measure_Cloud.dof

@@ -90,7 +90,7 @@ MaxStackSize=1048576
 ImageBase=4194304
 ExeDescription=
 [Directories]
-OutputDir=C:\Program Files (x86)\纵横软件\计量支付 (单机版+云版) 1
+OutputDir=C:\Program Files (x86)\纵横软件\纵横结算决算计量一体化软件(云版)
 UnitOutputDir=D:\Work\DelphiTemp
 PackageDLLOutputDir=
 PackageDCPOutputDir=
@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=3
-Build=1085
+Build=1087
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化云版
-FileVersion=3.1.3.1085
+FileVersion=3.1.3.1087
 InternalName=
 LegalCopyright=
 LegalTrademarks=
@@ -144,5 +144,6 @@ Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
 Count=1
 Item0=D:\Work\DelphiTemp
 [HistoryLists\hlOutputDirectorry]
-Count=1
-Item0=C:\Program Files (x86)\纵横软件\计量支付 (单机版+云版) 1
+Count=2
+Item0=C:\Program Files (x86)\纵横软件\纵横结算决算计量一体化软件(云版)
+Item1=C:\Program Files (x86)\纵横软件\计量支付 (单机版+云版) 1

Frames/ProjectManagerFme.pas

@@ -1759,6 +1759,8 @@ procedure TProjectManagerFrame.OnLineChecker(AAr: TOVArr; var ABegin,
 var i, j: Integer;
   vCS: TCheckStatus;
 begin
+  i := 0;
+  j := 0;
   ABegin := 0;
   AEnd := 0;
   AOnLineEndIsOwner := AAr[High(AAr), 7] = '1';       // 接口返回的第7列是线上审批标记
@@ -1789,16 +1791,14 @@ begin
   end;
 
   if AEnd = 0 then Exit;
-
-  i := i - 1;
-  if i < 0 then
+  if AEnd = 1 then
   begin
     ABegin := 1;
     Exit;
   end;
 
 
-  for j := i downto 0 do
+  for j := AEnd -2 downto 0 do
   begin
     if AAr[j, 7] = '0' then
     begin