Forráskód Böngészése

Bug #1053 变更令,小数位数事宜

MaiXinRong 8 éve
szülő
commit
005908bc09
2 módosított fájl, 15 hozzáadás és 5 törlés
  1. 4 4
      DataModules/BGLDm.pas
  2. 11 1
      Units/ProjectData.pas

+ 4 - 4
DataModules/BGLDm.pas

@@ -367,18 +367,18 @@ end;
 procedure TBGLData.ApplyBGL(ABGLInfo: TBGLSelectInfo);
 var
   I: Integer;
+  fNum: Double;
 begin
   for I := 0 to ABGLInfo.Count - 1 do
     if LocateBGL(ABGLInfo.Codes[I]) and
         LocateBGBills(cdsBGLID.AsInteger, ABGLInfo.B_Code) then
     begin
       cdsBGBills.Edit;
+      fNum := QuantityRoundTo(StrToFloatDef(ABGLInfo.Nums[I], 0));
       if ABGLInfo.IsOrg then
-        cdsBGBillsUsedQuantity.AsFloat := cdsBGBillsUsedQuantity.AsFloat
-            - QuantityRoundTo(StrToFloatDef(ABGLInfo.Nums[I], 0))
+        cdsBGBillsUsedQuantity.AsFloat := QuantityRoundTo(cdsBGBillsUsedQuantity.AsFloat - fNum)
       else
-        cdsBGBillsUsedQuantity.AsFloat := cdsBGBillsUsedQuantity.AsFloat
-            + QuantityRoundTo(StrToFloatDef(ABGLInfo.Nums[I], 0));
+        cdsBGBillsUsedQuantity.AsFloat := QuantityRoundTo(cdsBGBillsUsedQuantity.AsFloat + fNum);
       cdsBGBills.Post;
       UpdateBGLExecutionRate(cdsBGBillsBGID.AsInteger);
     end;

+ 11 - 1
Units/ProjectData.pas

@@ -1703,11 +1703,21 @@ procedure TProjectData.ResetFloatDigitView;
     end;
   end;
 
+  procedure SetBGLDigit;
+  begin
+    FBGLData.cdsBGLViewTotalPrice.DisplayFormat := FProjProperties.TotalPriceFormat;
+    FBGLData.cdsBGBillsViewPrice.DisplayFormat := FProjProperties.PriceFormat;
+    FBGLData.cdsBGBillsViewQuantity.DisplayFormat := FProjProperties.QuantityFormat;
+    FBGLData.cdsBGBillsViewTotalPrice.DisplayFormat := FProjProperties.TotalPriceFormat;
+    FBGLData.cdsBGBillsViewUsedQuantity.DisplayFormat := FProjProperties.QuantityFormat;
+  end;
+
 begin
   SetBillsCompileDigit;
   SetBillsMeasureDigit;
   SetDealPaymentDigit;
   SetBillsGatherDigit;
+  SetBGLDigit;
 end;
 
 function TProjectData.GetStageDataReadOnly: Boolean;
@@ -1815,7 +1825,7 @@ procedure TProjectData.CopyPreData;
   const
     sCopySql = 'Insert Into GLPrice (GLID, PhaseID,' +
                '    InfoPrice, InfoDate, DeltaPrice, ValidDeltaPrice,' +
-               '    PreUsedQuantity, PreUsedTotalprice' +
+               '    PreUsedQuantity, PreUsedTotalPrice,' +
                '    PM_PreQuantity, PM_PreTotalPrice,'+
                '    PrePAL_UsedQuantity, PrePAL_UsedTotalPrice,'+
                '    PrePAL_DeltaPrice, PrePAL_Total)'+