Merge branch 'master' of http://192.168.1.12:3000/MaiXinRong/Measure

DataModules/ReportMemoryDm/rmGclBillsBGDm.pas

@@ -461,7 +461,7 @@ var
 begin
   PhaseData := TPhaseData.Create(FProjectData);
   try
-    PhaseData.SimpleOpen(Format('%s\Phase%d.dat', [FProjectData.TempPath, APhaseIndex]));
+    PhaseData.SimpleOpen2(Format('%s\Phase%d.dat', [FProjectData.TempPath, APhaseIndex]));
     cdsBills.Append;
     cdsBillsName.AsString := Format('µÚ %d ÆÚ', [APhaseIndex]);
     cdsBillsSerialNo.AsInteger := APhaseIndex;

Frames/ProjectFme.pas

@@ -1515,7 +1515,10 @@ end;
 
 function TProjectFrame.CheckCanReport: Boolean;
 begin
-  Result := QuestMessageYesNo('请确定已生成中间计量数据？');
+  if not _IsCloud or ProjectData.CurUserIsAuthor then
+    Result := QuestMessageYesNo('请检查中间计量数据是否生成。')
+  else
+    Result := QuestMessageYesNo('如修改过本期计量数据，请先点击【否】完善【中间计量】窗口数据。');
   // 使用控件点击进行定位，重新定义方法太复杂
   if not Result then
   begin

Units/MCacheTree.pas

@@ -675,7 +675,7 @@ begin
   begin
     sCodeID2 := ConvertDigitCode(Node.Code, 3, '-');
     sB_CodeID2 := ConvertDigitCode(Node.B_Code, 4, '-');
-    if sCodeID < sCodeID2 then
+    if (sCodeID <> '') and (sCodeID < sCodeID2) then
     begin
       Result := Node;
       Break;