Browse Source

1. 导入工程量清单至项目节,部分清单层次识别错误的Bug
2. 优化后,项目上报、批复时,计量参与人编辑,读取Bug

MaiXinRong 10 years ago
parent
commit
e9dff657ad
2 changed files with 3 additions and 3 deletions
  1. 2 2
      DataModules/StaffDm.pas
  2. 1 1
      Units/MCacheTree.pas

+ 2 - 2
DataModules/StaffDm.pas

@@ -144,7 +144,7 @@ end;
 procedure TStaffData.LockedDataForAudit;
 begin
   with TProjectData(FProjectData) do
-    if cdsStaff.FindKey([PhaseIndex, ProjProperties.AuditStatus]) then
+    if cdsStaff.FindKey([ProjProperties.PhaseCount, ProjProperties.AuditStatus]) then
     begin
       cdsStaff.Edit;
       cdsStaffLocked.AsBoolean := True;
@@ -173,7 +173,7 @@ end;
 function TStaffData.FinalStaffCompany: string;
 begin
   with TProjectData(FProjectData) do
-    if cdsStaff.FindKey([PhaseIndex, ProjProperties.AuditStatus]) then
+    if cdsStaff.FindKey([ProjProperties.PhaseCount, ProjProperties.AuditStatus]) then
       Result :=  cdsStaffCompany.AsString;
 end;
 

+ 1 - 1
Units/MCacheTree.pas

@@ -798,7 +798,7 @@ function TGclCacheTree.AddNodeByB_Code(
   function FindParent: TGclCacheNode;
   begin
     Result := FLastNode;
-    while Assigned(Result) and (Result.B_Code <> '') and (Pos(Result.B_Code, AB_Code) <> 1) do
+    while Assigned(Result) and (Result.B_Code <> '') and (Pos(Result.B_Code + '-', AB_Code) <> 1) do
       Result := TGclCacheNode(Result.Parent);
   end;