瀏覽代碼

Bug 修改未计量,并已添加调差工料的清单,材料调差--调差工料,相关工料的调差数据未重新计算

MaiXinRong 9 年之前
父節點
當前提交
764fb88c37
共有 2 個文件被更改,包括 3 次插入2 次删除
  1. 2 1
      DataModules/BillsMeasureDm.pas
  2. 1 1
      Units/ProjectData.pas

+ 2 - 1
DataModules/BillsMeasureDm.pas

@@ -541,8 +541,9 @@ begin
       if HasCardinalNum(ANewText) then
         raise Exception.Create('数量列公式不可输入参数');
     NewRec := StageData.AddStageRecord(ARecord.ValueByName('ID').AsInteger);
-    SetNewRecValue(NewRec);
     vNode.StageRec := NewRec;
+
+    SetNewRecValue(NewRec);
   end;
 end;
 

+ 1 - 1
Units/ProjectData.pas

@@ -1598,7 +1598,7 @@ end;
 function TProjectData.GetPriceMarginReadOnly: Boolean;
 begin
   if FPhaseData.Active then
-    Result := not((FPhaseIndex = FProjProperties.PhaseCount) and (FPhaseData.StageCount = 1))
+    Result := not((FPhaseIndex = FProjProperties.PhaseCount) and (FPhaseData.StageCount = 1) and (FProjProperties.AuditStatus <> -1))
   else
     Result := True;
 end;