合并3.1.3.3（含价差），解决冲突

DataModules/BillsDm.dfm

@@ -198,7 +198,6 @@ object BillsData: TBillsData
       02080549734B6579080F4E65656450726F636573734E616D65090001044E616D
       65060D4861734174746163686D656E74094669656C644E616D65060D48617341
       74746163686D656E740844617461547970650205084461746153697A65020105
-<<<<<<< HEAD
       49734B6579080F4E65656450726F636573734E616D65090001044E616D650608
       43616C6354797065094669656C644E616D65060843616C635479706508446174
       61547970650203084461746153697A6502040549734B6579080F4E6565645072
@@ -210,12 +209,9 @@ object BillsData: TBillsData
       C8000549734B6579080F4E65656450726F636573734E616D65090001044E616D
       65060A4F7468466F726D756C61094669656C644E616D65060A4F7468466F726D
       756C610844617461547970650218084461746153697A6503C8000549734B6579
-      080F4E65656450726F636573734E616D65090000}
-=======
-      49734B6579080F4E65656450726F636573734E616D65090001044E616D650610
-      504D5F416464546F74616C5072696365094669656C644E616D650610504D5F41
-      6464546F74616C50726963650844617461547970650206084461746153697A65
-      02080549734B6579080F4E65656450726F636573734E616D65090000}
->>>>>>> 3.1.3.3
+      080F4E65656450726F636573734E616D65090001044E616D650610504D5F4164
+      64546F74616C5072696365094669656C644E616D650610504D5F416464546F74
+      616C50726963650844617461547970650206084461746153697A650208054973
+      4B6579080F4E65656450726F636573734E616D65090000}
   end
 end

DataModules/StageDm.pas

@@ -48,12 +48,9 @@ type
 
     function GetTotalPrice(ABillsID, AType, AStageIndex: Integer): Double;
 
-<<<<<<< HEAD
     function GetCalcType(ABillsID: Integer): Integer;
-=======
     function GetBillsUnitPriceMargin(ABillsID: Integer): Double;
 
->>>>>>> 3.1.3.3
     function GetBillsPrice(ABillsID: Integer): Double;
     function GetBillsNewPrice(ABillsID: Integer): Double;
     function GetBillsPriceDiffer(ABillsID: Integer): Double;
@@ -205,13 +202,9 @@ begin
   UpdateComplete(ABillsID, fQtyDiffer, fTPDiffer);
   if TPhaseData(FPhaseData).IsLastStage then
     with TProjectData(TPhaseData(FPhaseData).ProjectData).BillsMeasureData do
-<<<<<<< HEAD
       UpdateRecordDeal(ABillsID, fQtyDiffer, fTPDiffer);
-=======
-     UpdateRecordDeal(ABillsID, fQtyDiffer, fTPDiffer);
 
   CalculatePriceMargin(ABillsID);
->>>>>>> 3.1.3.3
 
   TPhaseData(FPhaseData).PhasePayData.CalculateAll;
 end;
@@ -815,11 +808,11 @@ begin
   end;
 end;
 
-<<<<<<< HEAD
 function TStageData.GetCalcType(ABillsID: Integer): Integer;
 begin
   Result := MainBillsTree.FindNode(ABillsID).Rec.ValueByName('CalcType').AsInteger;
-=======
+end;
+
 procedure TStageData.CalculatePriceMarginNode;
 var
   Rec: TStageRecord;
@@ -951,7 +944,6 @@ begin
   case ANode.ID of
     iPriceMarginID: GatherPriceMargin(StageRec);
   end;
->>>>>>> 3.1.3.3
 end;
 
 end.

Units/DataBaseTables.pas

@@ -103,11 +103,7 @@ const
 
   {Çåµ¥Êý¾Ý -- ̨Õ˱༭½çÃæ}
   SBills = 'Bills';
-<<<<<<< HEAD
-  tdBills: array [0..82] of TScFieldDef =(
-=======
-  tdBills: array [0..79] of TScFieldDef =(
->>>>>>> 3.1.3.3
+  tdBills: array [0..83] of TScFieldDef =(
     (FieldName: 'ID'; FieldType: ftInteger; Size: 0; NotNull: True; PrimaryKey: True; ForceUpdate: False),
     (FieldName: 'ParentID'; FieldType: ftInteger; Size: 0; NotNull: True; PrimaryKey: False; ForceUpdate: False),
     (FieldName: 'NextSiblingID'; FieldType: ftInteger; Size: 0; NotNull: True; PrimaryKey: False; ForceUpdate: False),

Units/ProjectData.pas

@@ -229,11 +229,7 @@ implementation
 
 uses UtilMethods, Globals, ProjectCommands, sdIDTree, StageDm,
   ZJJLDm, PHPWebDm, XMLDoc, XMLIntf, ConstUnit, PasswordInputFrm,
-<<<<<<< HEAD
-  mProgressProFrm;
-=======
-  mDataRecord;
->>>>>>> 3.1.3.3
+  mProgressProFrm, mDataRecord;
 
 { TProjectData }
 

Units/mDataRecord.pas

@@ -98,13 +98,11 @@ type
 
     FAddCompleteRate: TsdValue;
 
-<<<<<<< HEAD
     FCacheMisTP: Double;
     FCacheOrgTP: Double;
     FCacheOthTP: Double;
-=======
+
     FPM_AddTotalPrice: TsdValue;
->>>>>>> 3.1.3.3
   protected
     procedure DoAfterAddFields; override;
   public
@@ -187,14 +185,12 @@ type
 
     property AddCompleteRate: TsdValue read FAddCompleteRate;
 
-<<<<<<< HEAD
     // Cache Data 用于增量计算，记录原始值
     property CacheOrgTP: Double read FCacheOrgTP write FCacheOrgTP;
     property CacheMisTP: Double read FCacheMisTP write FCacheMisTP;
     property CacheOthTP: Double read FCacheOthTP write FCacheOthTP;
-=======
+    
     property PM_AddTotalPrice: TsdValue read FPM_AddTotalPrice;
->>>>>>> 3.1.3.3
   end;
 
   TStageRecord = class(TMeasureBaseRecord)
@@ -252,12 +248,10 @@ type
     FHasBookMark: TsdValue;
     FMarkMemo: TsdValue;
 
-<<<<<<< HEAD
     FCacheDealTP: Double;
-=======
+
     FPM_PreTotalPrice: TsdValue;
     FPM_TotalPrice: TsdValue;
->>>>>>> 3.1.3.3
   protected
     procedure DoAfterAddFields; override;
   public
@@ -314,9 +308,9 @@ type
     property HasBookMark: TsdValue read FHasBookMark;
     property MarkMemo: TsdValue read FMarkMemo;
 
-<<<<<<< HEAD
+
     property CacheDealTP: Double read FCacheDealTP write FCacheDealTP;
-=======
+
     property PM_PreTotalPrice: TsdValue read FPM_PreTotalPrice;
     property PM_TotalPrice: TsdValue read FPM_TotalPrice;
   end;
@@ -397,7 +391,6 @@ type
     property LockedPhaseID: TsdValue read FLockedPhaseID;
 
     property RelaProjectGL: TProjectGLRecord read FRelaProjectGL write FRelaProjectGL;
->>>>>>> 3.1.3.3
   end;
 
 implementation