Task #1229 材料调差，价差盈亏功能变更

道不同，不相为谋。

DataModules/ProjectGLDm.pas

@@ -614,7 +614,7 @@ begin
   ARec.UsedTotalPrice.AsFloat := Decimal.TotalPrice.RoundTo(ARec.UsedQuantity.AsFloat * ARec.InfoPrice.AsFloat);
   ARec.PAL_UsedQuantity.AsFloat := Decimal.Quantity.RoundTo(ARec.PM_Quantity.AsFloat - ARec.UsedQuantity.AsFloat);
   ARec.PAL_UsedTotalPrice.AsFloat := Decimal.TotalPrice.RoundTo(ARec.PAL_UsedQuantity.AsFloat * ARec.BasePrice.AsFloat);
-  ARec.PAL_DeltaPrice.AsFloat := Decimal.TotalPrice.RoundTo(ARec.UsedQuantity.AsFloat * ARec.ValidDeltaPrice.AsFloat);
+  ARec.PAL_DeltaPrice.AsFloat := Decimal.TotalPrice.RoundTo( - ARec.UsedQuantity.AsFloat * ARec.DeltaPrice.AsFloat);
   ARec.PAL_Total.AsFloat := Decimal.TotalPrice.RoundTo(ARec.BasePrice.AsFloat*ARec.PM_Quantity.AsFloat - ARec.InfoPrice.AsFloat*ARec.UsedQuantity.AsFloat);
 end;
 

Frames/ProjectGLFme.dfm

@@ -11,7 +11,7 @@ object ProjectGLFrame: TProjectGLFrame
     Height = 313
     Options = [goRangeSelect, goRowSizing, goColSizing, goCellNotMaintainData, goFixedRowShowNo, goFixedColShowNo, goAlwaysShowSelection]
     OptionsEx = []
-    ColCount = 19
+    ColCount = 18
     RowCount = 6
     FixedRowCount = 2
     ShowGridLine = False
@@ -103,7 +103,7 @@ object ProjectGLFrame: TProjectGLFrame
         ReadOnly = False
       end
       item
-        Title.Caption = #22522#20934#20215
+        Title.Caption = #26412#26399#24212#32791#25968#37327
         Title.CaptionAcrossCols = '1'
         Title.CaptionAcrossRows = 2
         Title.Font.Charset = GB2312_CHARSET
@@ -117,12 +117,12 @@ object ProjectGLFrame: TProjectGLFrame
         Font.Height = -12
         Font.Name = #23435#20307
         Font.Style = []
-        FieldName = 'BasePrice'
-        Width = 60
-        ReadOnly = False
+        FieldName = 'PM_Quantity'
+        Width = 85
+        ReadOnly = True
       end
       item
-        Title.Caption = #39118#38505#24133#24230
+        Title.Caption = #22522#20934#20215
         Title.CaptionAcrossCols = '1'
         Title.CaptionAcrossRows = 2
         Title.Font.Charset = GB2312_CHARSET
@@ -136,13 +136,13 @@ object ProjectGLFrame: TProjectGLFrame
         Font.Height = -12
         Font.Name = #23435#20307
         Font.Style = []
-        FieldName = 'RiskRange'
+        FieldName = 'BasePrice'
         Width = 60
         ReadOnly = False
       end
       item
         Title.Caption = #26412#26399#20449#24687#20215'|'#20215#26684
-        Title.CaptionAcrossCols = '4'
+        Title.CaptionAcrossCols = '3'
         Title.Font.Charset = GB2312_CHARSET
         Title.Font.Color = clWindowText
         Title.Font.Height = -12
@@ -194,8 +194,8 @@ object ProjectGLFrame: TProjectGLFrame
         ReadOnly = True
       end
       item
-        Title.Caption = '|'#26377#25928#20215#24046
-        Title.CaptionAcrossCols = '1'
+        Title.Caption = #26412#26399#26448#26009#35843#24046'|'#39118#38505#24133#24230
+        Title.CaptionAcrossCols = '3'
         Title.Font.Charset = GB2312_CHARSET
         Title.Font.Color = clWindowText
         Title.Font.Height = -12
@@ -207,13 +207,13 @@ object ProjectGLFrame: TProjectGLFrame
         Font.Height = -12
         Font.Name = #23435#20307
         Font.Style = []
-        FieldName = 'ValidDeltaPrice'
+        FieldName = 'RiskRange'
         Width = 60
-        ReadOnly = True
+        ReadOnly = False
       end
       item
-        Title.Caption = #26412#26399#20215#24046#35745#31639'|'#25968#37327
-        Title.CaptionAcrossCols = '2'
+        Title.Caption = '|'#26377#25928#20215#24046
+        Title.CaptionAcrossCols = '1'
         Title.Font.Charset = GB2312_CHARSET
         Title.Font.Color = clWindowText
         Title.Font.Height = -12
@@ -225,12 +225,12 @@ object ProjectGLFrame: TProjectGLFrame
         Font.Height = -12
         Font.Name = #23435#20307
         Font.Style = []
-        FieldName = 'PM_Quantity'
+        FieldName = 'ValidDeltaPrice'
         Width = 60
         ReadOnly = True
       end
       item
-        Title.Caption = '|'#37329#39069
+        Title.Caption = '|'#35843#24046#37329#39069
         Title.CaptionAcrossCols = '1'
         Title.Font.Charset = GB2312_CHARSET
         Title.Font.Color = clWindowText
@@ -248,8 +248,8 @@ object ProjectGLFrame: TProjectGLFrame
         ReadOnly = True
       end
       item
-        Title.Caption = #26412#26399#23454#32791'|'#25968#37327
-        Title.CaptionAcrossCols = '2'
+        Title.Caption = #26412#26399#23454#32791#20998#26512'|'#26412#26399#23454#32791#25968#37327
+        Title.CaptionAcrossCols = '5'
         Title.Font.Charset = GB2312_CHARSET
         Title.Font.Color = clWindowText
         Title.Font.Height = -12
@@ -262,29 +262,11 @@ object ProjectGLFrame: TProjectGLFrame
         Font.Name = #23435#20307
         Font.Style = []
         FieldName = 'UsedQuantity'
-        Width = 60
+        Width = 85
         ReadOnly = False
       end
       item
-        Title.Caption = '|'#37329#39069
-        Title.CaptionAcrossCols = '1'
-        Title.Font.Charset = GB2312_CHARSET
-        Title.Font.Color = clWindowText
-        Title.Font.Height = -12
-        Title.Font.Name = #23435#20307
-        Title.Font.Style = []
-        Alignment = taRightJustify
-        Font.Charset = GB2312_CHARSET
-        Font.Color = clWindowText
-        Font.Height = -12
-        Font.Name = #23435#20307
-        Font.Style = []
-        FieldName = 'UsedTotalPrice'
-        Width = 60
-        ReadOnly = True
-      end
-      item
-        Title.Caption = #26412#26399#28040#32791#30408#20111'|'#25968#37327#30408#20111
+        Title.Caption = #26412#26399#28040#32791#30408#20111'|'#25968#37327#24046
         Title.CaptionAcrossCols = '4'
         Title.Font.Charset = GB2312_CHARSET
         Title.Font.Color = clWindowText
@@ -302,7 +284,7 @@ object ProjectGLFrame: TProjectGLFrame
         ReadOnly = True
       end
       item
-        Title.Caption = '|'#25968#37327#30408#20111#37329#39069
+        Title.Caption = '|'#25968#37327#24046#37329#39069
         Title.CaptionAcrossCols = '1'
         Title.Font.Charset = GB2312_CHARSET
         Title.Font.Color = clWindowText
@@ -316,11 +298,11 @@ object ProjectGLFrame: TProjectGLFrame
         Font.Name = #23435#20307
         Font.Style = []
         FieldName = 'PAL_UsedTotalPrice'
-        Width = 82
+        Width = 70
         ReadOnly = True
       end
       item
-        Title.Caption = '|'#20215#24046#30408#20111#37329#39069
+        Title.Caption = '|'#23454#32791#20215#24046#37329#39069
         Title.CaptionAcrossCols = '1'
         Title.Font.Charset = GB2312_CHARSET
         Title.Font.Color = clWindowText
@@ -334,11 +316,11 @@ object ProjectGLFrame: TProjectGLFrame
         Font.Name = #23435#20307
         Font.Style = []
         FieldName = 'PAL_DeltaPrice'
-        Width = 82
+        Width = 85
         ReadOnly = True
       end
       item
-        Title.Caption = '|'#21512#35745#30408#20111#37329#39069
+        Title.Caption = '|'#33410#20313#37329#39069
         Title.CaptionAcrossCols = '1'
         Title.Font.Charset = GB2312_CHARSET
         Title.Font.Color = clWindowText
@@ -352,7 +334,7 @@ object ProjectGLFrame: TProjectGLFrame
         Font.Name = #23435#20307
         Font.Style = []
         FieldName = 'PAL_Total'
-        Width = 82
+        Width = 60
         ReadOnly = True
       end>
     Grid = zgProjectGL

Frames/ProjectGLFme.pas

@@ -1,5 +1,7 @@
 unit ProjectGLFme;
 
+// 2016.8.18 真的是理解不来这家公司，看在钱的面子上，拿人钱财替人消灾。
+
 interface
 
 uses