Explorar el Código

接收文件,升级文件错误

MaiXinRong hace 10 años
padre
commit
f0fbb130e3
Se han modificado 1 ficheros con 15 adiciones y 3 borrados
  1. 15 3
      DataModules/StageLeafXmjGlDm.pas

+ 15 - 3
DataModules/StageLeafXmjGlDm.pas

@@ -28,6 +28,7 @@ type
     procedure CalculatePALRela(ARec:TStageLeafXmjGlRecord; AProjGLRec: TProjectGLRecord);
 
     function GetDecimal: TCalcDecimal;
+    function GetActive: Boolean;
   public
     constructor Create(APhaseData: TObject);
     destructor Destroy; override;
@@ -47,6 +48,7 @@ type
     // 调整工料价格后,需计算项
     procedure CalculatePriceRela(AGLID: Integer);
 
+    property Active: Boolean read GetActive;
     property Decimal: TCalcDecimal read GetDecimal;
   end;
 
@@ -219,6 +221,8 @@ var
   end;
 
 begin
+  if not sddStageLeafXmjGl.Active then Exit;
+
   BeforeBatchOperation;
   vQuery := TADOQuery.Create(nil);
   try
@@ -244,9 +248,12 @@ end;
 
 procedure TStageLeafXmjGlData.Save;
 begin
-  sddStageLeafXmjGl.Save;
-  if not TPhaseData(FPhaseData).StageDataReadOnly then
-    SaveCurStageData;
+  if sddStageLeafXmjGl.Active then
+  begin
+    sddStageLeafXmjGl.Save;
+    if not TPhaseData(FPhaseData).StageDataReadOnly then
+      SaveCurStageData;
+  end;
 end;
 
 procedure TStageLeafXmjGlData.SaveCurStageData;
@@ -439,4 +446,9 @@ begin
   end;
 end;
 
+function TStageLeafXmjGlData.GetActive: Boolean;
+begin
+  Result := sddStageLeafXmjGl.Active;
+end;
+
 end.