Merge branch '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

DataModules/ReportMemoryDm/rmHaBaiCustomizedDm.pas

@@ -618,6 +618,19 @@ procedure TrmHaBaiCustomizedData.WriteReport2;
     cdsCustom2.Post;
   end;
 
+  procedure WriteMentalNode;
+  begin
+    cdsCustom2.Append;
+    cdsCustom2Name.AsString := '連  마';
+    cdsCustom2EndGatherTotalPrice.AsFloat := FGclControl.GclChapterGather.EndGatherTotalPrice + FDealPayControl.PlusGather.EndTotalPrice
+        - FDealPayControl.MinusGather.EndTotalPrice;
+    cdsCustom2PreGatherTotalPrice.AsFloat := FGclControl.GclChapterGather.PreGatherTotalPrice + FDealPayControl.PlusGather.PreTotalPrice
+        - FDealPayControl.MinusGather.PreTotalPrice;
+    cdsCustom2CurGatherTotalPrice.AsFloat := FGclControl.GclChapterGather.CurGatherTotalPrice + FDealPayControl.PlusGather.CurTotalPrice
+        - FDealPayControl.MinusGather.CurTotalPrice;
+    cdsCustom2.Post;
+  end;
+
 var
   iIndex: Integer;
 begin
@@ -633,7 +646,9 @@ begin
   WriteSpecialRecord;
   for iIndex := 0 to FDealPayControl.MinusPayCount - 1 do
     WritePayNode(FDealPayControl.MinusPayNode[iIndex]);
-  WritePayNode(FDealPayControl.GatherPayNode, '連  마');
+  //WritePayNode(FDealPayControl.GatherPayNode, '連  마');
+  // �쒔깹唐챘깹
+  WriteMentalNode;
 end;
 
 procedure TrmHaBaiCustomizedData.WriteReport3;

Dprs/Pro/Measure.dof

@@ -114,8 +114,13 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=1
+<<<<<<< HEAD
 Release=5
 Build=3003
+=======
+Release=3
+Build=3037
+>>>>>>> 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.3003
 InternalName=
 LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
+=======
+FileVersion=3.1.3.3037
+InternalName=Measure
+LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
+>>>>>>> 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=3003
+=======
+Release=3
+Build=3037
+>>>>>>> 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.3003
 InternalName=
 LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
+=======
+FileVersion=3.1.3.3037
+InternalName=Measure
+LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
+>>>>>>> 3.1.3.3
 LegalTrademarks=Measure
 OriginalFilename=
 ProductName=纵横公路工程结算决算一体化软件

Units/ZhAPI.pas

@@ -82,3 +82,4 @@ end.
 
 
 
+