Merge remote-tracking branch 'remotes/origin/3.1.3.3' into 3.1.5

Conflicts:
	Dprs/Pro/Measure.dof
	Dprs/Pro/Measure.res
	Dprs/Pro/Measure_Cloud.dof
	Dprs/Pro/Measure_Cloud.res
	Dprs/Pro/Measure_GuangDong.dof
	Dprs/Pro/Measure_GuangDong.res
	Dprs/Pro/Measure_GuangDong_Cloud.dof
	Dprs/Pro/Measure_GuangDong_Cloud.res
	Dprs/Pro/Measure_GuangDong_TZ.cfg
	Dprs/Pro/Measure_GuangDong_TZ.dof
	Dprs/Pro/Measure_GuangDong_TZ.res
	Dprs/Pro/Measure_TZ.dof
	Dprs/Pro/Measure_TZ.res
	Dprs/Trail/Measure.dof
	Dprs/Trail/Measure.res
	Dprs/Trail/Measure_GuangDong.dof
	Dprs/Trail/Measure_GuangDong.res

DataModules/DealBillsDm.pas

@@ -101,7 +101,24 @@ begin
 end;
 
 procedure TDealBillsData.Save;
+
+  procedure CheckIndexCode;
+  var
+    i: Integer;
+    Rec: TsdDataRecord;
+    sIndexCode: string;
+  begin
+    for i := 0 to sddDealBills.RecordCount - 1 do
+    begin
+      Rec := sddDealBills.Records[i];
+      sIndexCode := B_CodeToIndexCode(Rec.ValueByName('B_Code').AsString);
+      if sIndexCode <> Rec.ValueByName('IndexCode').AsString then
+        Rec.ValueByName('IndexCode').AsString := sIndexCode;
+    end;
+  end;
+
 begin
+  CheckIndexCode;
   sddDealBills.Save;
 end;
 

DataModules/ReportMemoryDm/rmHaBaiCustomizedDm.dfm

@@ -2,8 +2,8 @@ object rmHaBaiCustomizedData: TrmHaBaiCustomizedData
   OldCreateOrder = False
   Left = 723
   Top = 455
-  Height = 154
-  Width = 339
+  Height = 222
+  Width = 337
   object cdsCustom2: TClientDataSet
     Active = True
     Aggregates = <>
@@ -358,4 +358,75 @@ object rmHaBaiCustomizedData: TrmHaBaiCustomizedData
       FieldName = 'SerialNo'
     end
   end
+  object cdsCustomCS_1: TClientDataSet
+    Active = True
+    Aggregates = <>
+    Params = <>
+    Left = 32
+    Top = 120
+    Data = {
+      900000009619E0BD01000000180000000400000000000300000090000B50756C
+      735061794E616D6502004A00000001000557494454480200020090011150756C
+      73506179546F74616C507269636508000400000000000C4D696E75735061794E
+      616D6502004A0000000100055749445448020002009001124D696E7573506179
+      546F74616C507269636508000400000000000000}
+    object cdsCustomCS_1PulsPayName: TWideStringField
+      FieldName = 'PulsPayName'
+      Size = 200
+    end
+    object cdsCustomCS_1PulsPayTotalPrice: TFloatField
+      FieldName = 'PulsPayTotalPrice'
+    end
+    object cdsCustomCS_1MinusPayName: TWideStringField
+      FieldName = 'MinusPayName'
+      Size = 200
+    end
+    object cdsCustomCS_1MinusPayTotalPrice: TFloatField
+      FieldName = 'MinusPayTotalPrice'
+    end
+  end
+  object cdsCustomCS_2: TClientDataSet
+    Active = True
+    Aggregates = <>
+    FieldDefs = <
+      item
+        Name = 'DealTotalPrice'
+        DataType = ftFloat
+      end
+      item
+        Name = 'EndCompleteTotalPrice'
+        DataType = ftFloat
+      end
+      item
+        Name = 'PreCompleteTotalPrice'
+        DataType = ftFloat
+      end
+      item
+        Name = 'CurPayTotalPrice'
+        DataType = ftFloat
+      end>
+    IndexDefs = <>
+    Params = <>
+    StoreDefs = True
+    Left = 120
+    Top = 120
+    Data = {
+      860000009619E0BD01000000180000000400000000000300000086000E446561
+      6C546F74616C5072696365080004000000000015456E64436F6D706C65746554
+      6F74616C5072696365080004000000000015507265436F6D706C657465546F74
+      616C5072696365080004000000000010437572506179546F74616C5072696365
+      08000400000000000000}
+    object cdsCustomCS_2DealTotalPrice: TFloatField
+      FieldName = 'DealTotalPrice'
+    end
+    object cdsCustomCS_2EndCompleteTotalPrice: TFloatField
+      FieldName = 'EndCompleteTotalPrice'
+    end
+    object cdsCustomCS_2PreCompleteTotalPrice: TFloatField
+      FieldName = 'PreCompleteTotalPrice'
+    end
+    object cdsCustomCS_2CurPayTotalPrice: TFloatField
+      FieldName = 'CurPayTotalPrice'
+    end
+  end
 end

DataModules/ReportMemoryDm/rmHaBaiCustomizedDm.pas

@@ -195,6 +195,7 @@ type
     FPlusGather: TPayNode;
     FMinusGather: TPayNode;
     FGatherPayNode: TPayNode;
+    FCompletePayNode: TPayNode;
 
     function FindPlusPayNode(const AName: string): TPayNode;
     function NewPlusPayNode(const AName: string): TPayNode;
@@ -227,10 +228,12 @@ type
     property MinusGather: TPayNode read FMinusGather;
 
     property GatherPayNode: TPayNode read FGatherPayNode;
+    property CompletePayNode: TPayNode read FCompletePayNode;
   end;
 
   // 分别对应5张定制汇总表的编号，详见文档
-  THaBaiGatherType = (hbgt2, hbgt3, hbgt14, hbgt3_1, hbgt4_1);
+  THaBaiGatherType = (hbgt2, hbgt3, hbgt14, hbgt3_1, hbgt4_1, hbgt_CS);
+  // CS: Counter Sign 会签
 
   TrmHaBaiCustomizedData = class(TDataModule)
     cdsCustom2: TClientDataSet;
@@ -295,12 +298,27 @@ type
     cdsCustomProjCurPercent: TFloatField;
     cdsCustomProjEndPercent: TFloatField;
     cdsCustomProjSerialNo: TIntegerField;
+
+    // 会签表
+    // 流水
+    cdsCustomCS_1: TClientDataSet;
+    cdsCustomCS_1PulsPayName: TWideStringField;
+    cdsCustomCS_1PulsPayTotalPrice: TFloatField;
+    cdsCustomCS_1MinusPayName: TWideStringField;
+    cdsCustomCS_1MinusPayTotalPrice: TFloatField;
+    // 账单
+    cdsCustomCS_2: TClientDataSet;
+    cdsCustomCS_2DealTotalPrice: TFloatField;
+    cdsCustomCS_2EndCompleteTotalPrice: TFloatField;
+    cdsCustomCS_2PreCompleteTotalPrice: TFloatField;
+    cdsCustomCS_2CurPayTotalPrice: TFloatField;
   private
     FhbGatherType: THaBaiGatherType;
     FProjectData: TProjectData;
     FProjectName: string;
     FGclControl: TGclControl;
     FDealPayControl: TDealPayControl;
+    FDealTotalPrice: Double;
 
     procedure BeforeGather(AProjectCount: Integer);
     procedure AfterGather;
@@ -318,24 +336,28 @@ type
     procedure WriteReport3;
     procedure WriteReport3_1;
     procedure WriteReport4_1;
+    procedure WriteReportCounterSign;
 
     procedure WriteData;
   public
-    function AssignData(AProjects: TList; AhbGatherType: THaBaiGatherType): TDataSet;
+    function AssignData(AProjects: TList; AhbGatherType: THaBaiGatherType; AReCalc: Boolean): TDataSet;
+    function AssignAssistantData(AhbGatherType: THaBaiGatherType): TDataSet;
+
+    property hbGatherType: THaBaiGatherType read FhbGatherType;
   end;
 
 implementation
 
 uses
   UtilMethods, ZhAPI, BillsCompileDm, sdDB, Globals, Math, BillsMeasureDm,
-  ZJJLDm;
+  ZJJLDm, BillsDm;
 
 {$R *.dfm}
 
 { TrmHaBaiCustomizedData }
 
 function TrmHaBaiCustomizedData.AssignData(AProjects: TList;
-  AhbGatherType: THaBaiGatherType): TDataSet;
+  AhbGatherType: THaBaiGatherType; AReCalc: Boolean): TDataSet;
 var
   iProject: Integer;
 begin
@@ -344,7 +366,8 @@ begin
   try
     for iProject := 0 to AProjects.Count - 1 do
       GatherProject(TSelectProject(AProjects.Items[iProject]), iProject);
-    FGclControl.ReCalculateTotalPrice;
+    if AReCalc then
+      FGclControl.ReCalculateTotalPrice;
     FGclControl.Calculate;
     WriteData;
   finally
@@ -354,6 +377,7 @@ begin
       hbgt3: Result := cdsCustom3;
       hbgt14: Result := cdsCustom14;
       hbgt3_1, hbgt4_1: Result := cdsCustomProj;
+      hbgt_CS: Result := cdsCustomCS_1;
     end;
   end;
 end;
@@ -376,8 +400,17 @@ begin
   cdsCustomProj.Active := True;
   cdsCustomProj.EmptyDataSet;
 
+  cdsCustomCS_1.DisableControls;
+  cdsCustomCS_1.Active := True;
+  cdsCustomCS_1.EmptyDataSet;
+
+  cdsCustomCS_2.DisableControls;
+  cdsCustomCS_2.Active := True;
+  cdsCustomCS_2.EmptyDataSet;
+
   FGclControl := TGclControl.Create(AProjectCount);
   FDealPayControl := TDealPayControl.Create;
+  FDealTotalPrice := 0;
 end;
 
 procedure TrmHaBaiCustomizedData.AfterGather;
@@ -385,6 +418,8 @@ begin
   FDealPayControl.Free;
   FGclControl.Free;
 
+  cdsCustomCS_2.EnableControls;
+  cdsCustomCS_1.EnableControls;
   cdsCustomProj.EnableControls;
   cdsCustom14.EnableControls;
   cdsCustom3.EnableControls;
@@ -419,10 +454,12 @@ begin
     FGclControl.ProjectName[AProjectIndex] := FProjectName;
     if FhbGatherType in [hbgt2, hbgt3, hbgt3_1, hbgt4_1] then
       FilterGcl(AProjectIndex);
-    if FhbGatherType = hbgt2 then
+    if FhbGatherType in [hbgt2, hbgt_CS] then
       FilterDealPay;
     if FhbGatherType = hbgt14 then
       WriteFlowData;
+    if FhbGatherType = hbgt_CS then
+      FDealTotalPrice := FDealTotalPrice + FProjectData.BillsData.Settlement[0];
   finally
     FreeProjectData;
   end;
@@ -466,19 +503,40 @@ var
           Continue;
         StageRec := FProjectData.PhaseData.PhasePayData.PayRecord(Rec.ValueByName('ID').AsInteger);
         DealPay := FDealPayControl.AddPayNode(Rec.ValueByName('Name').AsString, Rec.ValueByName('IsMinus').AsBoolean);
-        DealPay.CurTotalPrice := DealPay.CurTotalPrice + StageRec.ValueByName(sCurField).AsFloat;
-        DealPay.PreTotalPrice := DealPay.PreTotalPrice + StageRec.ValueByName(sPreField).AsFloat;
-        DealPay.EndTotalPrice := DealPay.EndTotalPrice + StageRec.ValueByName(sEndField).AsFloat;
+        if Assigned(StageRec) then
+        begin
+          DealPay.CurTotalPrice := DealPay.CurTotalPrice + StageRec.ValueByName(sCurField).AsFloat;
+          DealPay.PreTotalPrice := DealPay.PreTotalPrice + StageRec.ValueByName(sPreField).AsFloat;
+          DealPay.EndTotalPrice := DealPay.EndTotalPrice + StageRec.ValueByName(sEndField).AsFloat;
+        end;
       end;
     end;
   end;
 
+  procedure GatherCompletePayData;
+  var
+    Rec, StageRec: TsdDataRecord;
+  begin
+    Rec := FProjectData.DealPaymentData.DealPayRecord('本期完成计量');
+    StageRec := FProjectData.PhaseData.PhasePayData.PayRecord(Rec.ValueByName('ID').AsInteger);
+    if not Assigned(StageRec) then Exit;
+
+    with FDealPayControl.CompletePayNode do
+    begin
+      CurTotalPrice := CurTotalPrice + StageRec.ValueByName(sCurField).AsFloat;
+      PreTotalPrice := PreTotalPrice + StageRec.ValueByName(sPreField).AsFloat;
+      EndTotalPrice := EndTotalPrice + StageRec.ValueByName(sEndField).AsFloat;
+    end;
+  end;
+
   procedure GatherPayData;
   var
     Rec, StageRec: TsdDataRecord;
   begin
     Rec := FProjectData.DealPaymentData.DealPayRecord('本期应付');
     StageRec := FProjectData.PhaseData.PhasePayData.PayRecord(Rec.ValueByName('ID').AsInteger);
+    if not Assigned(StageRec) then Exit;
+
     with FDealPayControl.GatherPayNode do
     begin
       CurTotalPrice := CurTotalPrice + StageRec.ValueByName(sCurField).AsFloat;
@@ -492,6 +550,7 @@ begin
   sPreField := 'PreTotalPrice' + IntToStr(FProjectData.PhaseData.AuditCount);
   sEndField := 'EndTotalPrice' + IntToStr(FProjectData.PhaseData.AuditCount);
   GatherCommonDealPayData;
+  GatherCompletePayData;
   GatherPayData;
   FDealPayControl.CalculateAll;
 end;
@@ -503,6 +562,7 @@ begin
     hbgt3: WriteReport3;
     hbgt3_1: WriteReport3_1;
     hbgt4_1: WriteReport4_1;
+    hbgt_CS: WriteReportCounterSign;
   end;
 end;
 
@@ -859,6 +919,69 @@ begin
   end;
 end;
 
+function TrmHaBaiCustomizedData.AssignAssistantData(
+  AhbGatherType: THaBaiGatherType): TDataSet;
+begin
+  Result := nil;
+  if (AhbGatherType = hbgt_CS) and (FhbGatherType = hbgt_CS) then
+    Result := cdsCustomCS_2;
+end;
+
+procedure TrmHaBaiCustomizedData.WriteReportCounterSign;
+
+  procedure WriteCounterSign1;
+  var
+    i: Integer;
+    PayNode: TPayNode;
+  begin
+    cdsCustomCS_1.Append;
+    cdsCustomCS_1PulsPayName.AsString := '本期完成金额';
+    cdsCustomCS_1PulsPayTotalPrice.AsFloat := FDealPayControl.CompletePayNode.CurTotalPrice;
+    cdsCustomCS_1.Post;
+
+    for i := 0 to FDealPayControl.PlusPayCount - 1 do
+    begin
+      PayNode := FDealPayControl.PlusPayNode[i];
+      cdsCustomCS_1.Append;
+      cdsCustomCS_1PulsPayName.AsString := PayNode.Name;
+      cdsCustomCS_1PulsPayTotalPrice.AsFloat := PayNode.CurTotalPrice;
+      cdsCustomCS_1.Post;
+    end;
+
+    cdsCustomCS_1.Append;
+    cdsCustomCS_1PulsPayName.AsString := '迟付款利息';
+    cdsCustomCS_1.Post;
+
+    cdsCustomCS_1.First;
+    for i := 0 to FDealPayControl.MinusPayCount - 1 do
+    begin
+      PayNode := FDealPayControl.MinusPayNode[i];
+      if cdsCustomCS_1.Eof then
+        cdsCustomCS_1.Append
+      else
+        cdsCustomCS_1.Edit;
+      cdsCustomCS_1MinusPayName.AsString := PayNode.Name;
+      cdsCustomCS_1MinusPayTotalPrice.AsFloat := PayNode.CurTotalPrice;
+      cdsCustomCS_1.Post;
+      cdsCustomCS_1.Next;
+    end;
+  end;
+
+  procedure WriteCounterSign2;
+  begin
+    cdsCustomCS_2.Append;
+    cdsCustomCS_2DealTotalPrice.AsFloat := FDealTotalPrice;
+    cdsCustomCS_2EndCompleteTotalPrice.AsFloat := FDealPayControl.CompletePayNode.EndTotalPrice;
+    cdsCustomCS_2PreCompleteTotalPrice.AsFloat := FDealPayControl.CompletePayNode.PreTotalPrice;
+    cdsCustomCS_2CurPayTotalPrice.AsFloat := FDealPayControl.GatherPayNode.CurTotalPrice;
+    cdsCustomCS_2.Post;
+  end;
+
+begin
+  WriteCounterSign1;
+  WriteCounterSign2;
+end;
+
 { TGclNode }
 
 procedure TGclNode.Calculate;
@@ -1268,10 +1391,14 @@ begin
   FPlusGather := TPayNode.Create;
   FMinusGather := TPayNode.Create;
   FGatherPayNode := TPayNode.Create;
+  FGatherPayNode.Name := '本期应付';
+  FCompletePayNode :=TPayNode.Create;
+  FCompletePayNode.Name := '本期完成计量';
 end;
 
 destructor TDealPayControl.Destroy;
 begin
+  FCompletePayNode.Free;
   FGatherPayNode.Free;
   FMinusGather.Free;
   FPlusGather.Free;

Dprs/Pro/Measure.dof

@@ -114,8 +114,13 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
+<<<<<<< HEAD
 Release=5
 Build=310
+=======
+Release=3
+Build=3035
+>>>>>>> remotes/origin/3.1.3.3
 Debug=0
 PreRelease=0
 Special=0
@@ -126,9 +131,15 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化专业版
+<<<<<<< HEAD
 FileVersion=3.1.5.310
 InternalName=
 LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
+=======
+FileVersion=3.1.3.3035
+InternalName=Measure
+LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
+>>>>>>> remotes/origin/3.1.3.3
 LegalTrademarks=Measure
 OriginalFilename=
 ProductName=纵横公路工程结算决算一体化软件

Dprs/Pro/Measure_Cloud.dof

@@ -114,8 +114,13 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
+<<<<<<< HEAD
 Release=5
 Build=310
+=======
+Release=3
+Build=3035
+>>>>>>> remotes/origin/3.1.3.3
 Debug=0
 PreRelease=0
 Special=0
@@ -126,9 +131,15 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化云版
+<<<<<<< HEAD
 FileVersion=3.1.5.310
 InternalName=
 LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
+=======
+FileVersion=3.1.3.3035
+InternalName=Measure
+LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
+>>>>>>> remotes/origin/3.1.3.3
 LegalTrademarks=Measure
 OriginalFilename=
 ProductName=纵横公路工程结算决算一体化软件

Dprs/Pro/Measure_GuangDong.dof

@@ -114,8 +114,13 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
+<<<<<<< HEAD
 Release=5
 Build=310
+=======
+Release=3
+Build=3034
+>>>>>>> remotes/origin/3.1.3.3
 Debug=0
 PreRelease=0
 Special=0
@@ -126,9 +131,15 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化广东专业版
+<<<<<<< HEAD
 FileVersion=3.1.5.310
 InternalName=
 LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
+=======
+FileVersion=3.1.3.3034
+InternalName=Measure
+LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
+>>>>>>> remotes/origin/3.1.3.3
 LegalTrademarks=Measure
 OriginalFilename=
 ProductName=纵横公路工程结算决算一体化软件

Dprs/Pro/Measure_GuangDong_Cloud.dof

@@ -114,8 +114,13 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
+<<<<<<< HEAD
 Release=5
 Build=310
+=======
+Release=3
+Build=3034
+>>>>>>> remotes/origin/3.1.3.3
 Debug=0
 PreRelease=0
 Special=0
@@ -126,9 +131,15 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化广东云版
+<<<<<<< HEAD
 FileVersion=3.1.5.310
 InternalName=
 LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
+=======
+FileVersion=3.1.3.3034
+InternalName=Measure
+LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
+>>>>>>> remotes/origin/3.1.3.3
 LegalTrademarks=Measure
 OriginalFilename=
 ProductName=纵横公路工程结算决算一体化软件
@@ -138,7 +149,11 @@ C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEdito
 C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxExtEditorsVCLD7.bpl=ExpressExtendedEditors Library 5 (VCL Edition) by Developer Express Inc.
 [HistoryLists\hlConditionals]
 Count=1
+<<<<<<< HEAD
 Item0=_mCloud;_mGuangDong
+=======
+Item0=_mCloud;_mEncrypt;_mGuangDong
+>>>>>>> remotes/origin/3.1.3.3
 [HistoryLists\hlUnitAliases]
 Count=1
 Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;

Dprs/Pro/Measure_GuangDong_TZ.cfg

@@ -35,7 +35,11 @@
 -N"..\..\Dcus"
 -LE"c:\program files (x86)\borland\delphi7\Projects\Bpl"
 -LN"c:\program files (x86)\borland\delphi7\Projects\Bpl"
+<<<<<<< HEAD
 -D_mEncrypt;_mcompile;_mGuangDong
+=======
+-D_mEncrypt;_mGuangDong;_mcompile;
+>>>>>>> remotes/origin/3.1.3.3
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE
 -w-UNSAFE_CAST

Dprs/Pro/Measure_TZ.dof

@@ -114,8 +114,13 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
+<<<<<<< HEAD
 Release=5
 Build=310
+=======
+Release=3
+Build=3034
+>>>>>>> remotes/origin/3.1.3.3
 Debug=0
 PreRelease=0
 Special=0
@@ -126,9 +131,15 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横0号台账专业版
+<<<<<<< HEAD
 FileVersion=3.1.5.310
 InternalName=
 LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
+=======
+FileVersion=3.1.3.3034
+InternalName=Measure
+LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
+>>>>>>> remotes/origin/3.1.3.3
 LegalTrademarks=Measure
 OriginalFilename=
 ProductName=纵横公路工程结算决算一体化软件

Dprs/Trail/Measure.dof

@@ -114,8 +114,13 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
+<<<<<<< HEAD
 Release=5
 Build=310
+=======
+Release=3
+Build=3032
+>>>>>>> remotes/origin/3.1.3.3
 Debug=0
 PreRelease=0
 Special=0
@@ -125,11 +130,19 @@ Locale=2052
 CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
+<<<<<<< HEAD
 FileDescription=纵横结算决算计量一体化专业版
 FileVersion=3.1.5.310
 InternalName=
 LegalCopyright=
 LegalTrademarks=
+=======
+FileDescription=纵横结算决算计量一体化学习版
+FileVersion=3.1.3.3032
+InternalName=Measure
+LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
+LegalTrademarks=Measure
+>>>>>>> remotes/origin/3.1.3.3
 OriginalFilename=
 ProductName=
 ProductVersion=1.0.0.0

Dprs/Trail/Measure_GuangDong.dof

@@ -114,8 +114,13 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
+<<<<<<< HEAD
 Release=5
 Build=310
+=======
+Release=3
+Build=3032
+>>>>>>> remotes/origin/3.1.3.3
 Debug=0
 PreRelease=0
 Special=0
@@ -126,10 +131,17 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化广东学习版
+<<<<<<< HEAD
 FileVersion=3.1.5.310
 InternalName=
 LegalCopyright=
 LegalTrademarks=
+=======
+FileVersion=3.1.3.3032
+InternalName=Measure
+LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
+LegalTrademarks=Measure
+>>>>>>> remotes/origin/3.1.3.3
 OriginalFilename=
 ProductName=
 ProductVersion=1.0.0.0

Units/ProjectData.pas

@@ -1172,7 +1172,8 @@ procedure TProjectData.ImportCloudTenderFile(const AFileName: string);
                 '    Peg, DrawingCode, MemoStr, HasBookMark, MarkMemo'+
                 '  From Bills In ''%s''';
 
-    sDealBillsSql = 'Insert Into DealBills Select * From DealBills In ''%s''';
+    sDealBillsSql = 'Insert Into DealBills Select ID, B_Code, Name, Units, Price, Quantity, TotalPrice'+
+                    '  From DealBills In ''%s''';
 
     sDealPaymentSql = 'Insert Into DealPayment (ID, Name, CalcType, IsMinus,'+
                       '    Formula, StartedPrice, SFormula, RangePrice, RFormula)'+

Units/ReportManager.pas

@@ -668,7 +668,10 @@ end;
 function TMemoryReportManager.GetMemoryDataSet(
   ADataSetID: Integer; AProjectData: TProjectData): TDataSet;
 begin
-  //ADataSetID := 49;
+  {if FrmHaBaiCustomizedData.hbGatherType = hbgt_CS then
+    ADataSetID := 51
+  else
+    ADataSetID := 50;}
   case ADataSetID of
     1: Result := FrmGridHeaderData.AssginData(AProjectData);   // 몹깊깊庫
     2: Result := FrmGclBillsBGData.AssignData(AProjectData, rmtPhaseGather, rmgtGather); // 묏넋좆헌데[굶퍅供냥]
@@ -685,8 +688,10 @@ begin
        // 02/03꼬겻, 07꼬겻, 08꼬겻, 09꼬겻, 11꼬겻, 12꼬겻, 16꼬겻, 17꼬겻, 18꼬겻, 19꼬겻,
        32, 33, 35, 36, 39, 40, 44,
        // 讀엑9, 讀엑06-1, 讀엑04, 讀엑01, 묏넋좆헌데쏵똑[맵據멕밗애땍齡], [밤땜凉헤땍齡]셕좆삠悧깊
-       45, 46, 47, 48, 49:
-       // 코촁뮴벗겜땍齡깊(連깊2, 連깊3, 連깊14, 連깊3-1, 連깊4-1)
+       45, 46, 47, 48, 49, 50,
+       // 코촁뮴벗겜땍齡깊(連깊2, 連깊3, 連깊14, 連깊3-1, 連깊4-1, 삔푯)
+       52, 53, 54, 55:
+       // 코촁뮴306벌돛땍齡(連깊2, 連깊3, 連깊3-1, 連깊4-1)
         Result := SelectProjectsAndAssignData(ADataSetID);
     14: Result := FrmGclBillsBGData.AssignData(AProjectData, rmtPhaseDeal, rmgtGather); // 묏넋좆헌데[굶퍅북谿]
     15: Result := FrmGclBillsBGData.AssignData(AProjectData, rmtPhaseQc, rmgtGather); // 묏넋좆헌데[굶퍅鑒좆긴뫘]
@@ -701,6 +706,7 @@ begin
     38: Result := FrmGclBillsPlaneData.AssignData(AProjectData); // 묏넋좆헌데틱충깊[르쉔0뵀憩瑯]
     42: Result := FrmGcl_XmjBillsData.AssignData(AProjectData, gxtFlowGcl); // 暾켓깃硫깊，憩瑯츠玖깊
     43: Result := FrmGcl_XmjBillsData.AssignData(AProjectData, gxtWithoutXmj); // 暾켓깃硫깊，데깃뙈헌데삠悧깊
+    51: Result := FrmHaBaiCustomizedData.AssignAssistantData(hbgt_CS); //코촁뮴벗겜、벌돛306땍齡깊--삔푯릅燎깊
   end;
   // For Inner Test
   //ShowTestForm(Result);
@@ -818,11 +824,16 @@ begin
       36: Result := FrmOtherReport1Data.AssignData(FTenders);
       39, 40: Result := FrmMentalCustomized1Data.AssignData(FTenders);
       44: Result := FrmCustomized2Data.AssignData(FTenders);
-      45: Result := FrmHaBaiCustomizedData.AssignData(FTenders, hbgt2);
-      46: Result := FrmHaBaiCustomizedData.AssignData(FTenders, hbgt3);
-      47: Result := FrmHaBaiCustomizedData.AssignData(FTenders, hbgt14);
-      48: Result := FrmHaBaiCustomizedData.AssignData(FTenders, hbgt3_1);
-      49: Result := FrmHaBaiCustomizedData.AssignData(FTenders, hbgt4_1);
+      45: Result := FrmHaBaiCustomizedData.AssignData(FTenders, hbgt2, True);
+      46: Result := FrmHaBaiCustomizedData.AssignData(FTenders, hbgt3, True);
+      47: Result := FrmHaBaiCustomizedData.AssignData(FTenders, hbgt14, True);
+      48: Result := FrmHaBaiCustomizedData.AssignData(FTenders, hbgt3_1, True);
+      49: Result := FrmHaBaiCustomizedData.AssignData(FTenders, hbgt4_1, True);
+      50: Result := FrmHaBaiCustomizedData.AssignData(FTenders, hbgt_CS, True);
+      52: Result := FrmHaBaiCustomizedData.AssignData(FTenders, hbgt2, True);
+      53: Result := FrmHaBaiCustomizedData.AssignData(FTenders, hbgt3, True);
+      54: Result := FrmHaBaiCustomizedData.AssignData(FTenders, hbgt3_1, True);
+      55: Result := FrmHaBaiCustomizedData.AssignData(FTenders, hbgt4_1, True);
       else Result := FrmBillsGatherData.AssignData(FTenders);
     end;
   end;