Merge branch '3.1.3.3PriceMargin(Temp)' of http://192.168.1.12:3000/maixinrong/measure into 3.1.3.3PriceMargin(Temp)

Dprs/Pro/Measure.cfg

@@ -31,10 +31,10 @@
 -M
 -$M16384,1048576
 -K$00400000
--E"E:\SmartCostExe\Measure"
+-E"D:\SmartCostExe\Measure"
 -N"..\..\Dcus"
--LE"d:\program files (x86)\borland\delphi7\Projects\Bpl"
--LN"d:\program files (x86)\borland\delphi7\Projects\Bpl"
+-LE"c:\program files (x86)\borland\delphi7\Projects\Bpl"
+-LN"c:\program files (x86)\borland\delphi7\Projects\Bpl"
 -D_mEncrypt;
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE

Dprs/Pro/Measure.dof

@@ -90,7 +90,7 @@ MaxStackSize=1048576
 ImageBase=4194304
 ExeDescription=
 [Directories]
-OutputDir=E:\SmartCostExe\Measure
+OutputDir=D:\SmartCostExe\Measure
 UnitOutputDir=..\..\Dcus
 PackageDLLOutputDir=
 PackageDCPOutputDir=
@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=3
-Build=1031
+Build=3003
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化专业版
-FileVersion=3.1.3.1031
+FileVersion=3.1.3.3003
 InternalName=Measure
 LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
 LegalTrademarks=Measure
@@ -134,6 +134,9 @@ OriginalFilename=
 ProductName=纵横公路工程计量决算一体化软件
 ProductVersion=3
 Comments=
+[Excluded Packages]
+C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxEditorsVCLD7.bpl=ExpressEditors Library 5 (VCL Edition) by Developer Express Inc.
+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=10
 Item0=_mEncrypt;
@@ -154,12 +157,13 @@ Count=2
 Item0=..\..\Dcus
 Item1=..\Dcus
 [HistoryLists\hlOutputDirectorry]
-Count=8
-Item0=E:\SmartCostExe\Measure
-Item1=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(专业版4)
-Item2=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(专业版)
-Item3=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(专业版2)
-Item4=D:\Program Files (x86)\纵横软件\纵横公路工程计量支付(专业版)
-Item5=D:\Program Files\纵横软件\Environment
-Item6=..\..\Environment
-Item7=..\Dcus
+Count=9
+Item0=D:\SmartCostExe\Measure
+Item1=E:\SmartCostExe\Measure
+Item2=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(专业版4)
+Item3=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(专业版)
+Item4=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(专业版2)
+Item5=D:\Program Files (x86)\纵横软件\纵横公路工程计量支付(专业版)
+Item6=D:\Program Files\纵横软件\Environment
+Item7=..\..\Environment
+Item8=..\Dcus

Dprs/Pro/Measure.dpr

@@ -135,7 +135,18 @@ uses
   BGLClipboard in '..\..\Units\BGLClipboard.pas',
   rmGcl_XmjBillsDm in '..\..\DataModules\ReportMemoryDm\rmGcl_XmjBillsDm.pas' {rmGcl_XmjBillsData: TDataModule},
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
-  CalcDecimal in '..\..\Units\CalcDecimal.pas';
+  CalcDecimal in '..\..\Units\CalcDecimal.pas',
+  ProjectGLDm in '..\..\DataModules\ProjectGLDm.pas' {ProjectGLData: TDataModule},
+  PriceMarginBillsDm in '..\..\DataModules\PriceMarginBillsDm.pas' {PriceMarginBillsData: TDataModule},
+  GclBillsGatherModel in '..\..\Units\GclBillsGatherModel.pas',
+  DetailGLDm in '..\..\DataModules\DetailGLDm.pas' {DetailGLData: TDataModule},
+  PriceMarginBillsFme in '..\..\Frames\PriceMarginBillsFme.pas' {PriceMarginBillsFrame: TFrame},
+  PriceMarginFme in '..\..\Frames\PriceMarginFme.pas' {PriceMarginFrame: TFrame},
+  ProjectGLFme in '..\..\Frames\ProjectGLFme.pas' {ProjectGLFrame: TFrame},
+  SelectDetailGLsFrm in '..\..\Forms\SelectDetailGLsFrm.pas' {SelectDetailGLsForm},
+  rmHaBaiCustomizedDm in '..\..\DataModules\ReportMemoryDm\rmHaBaiCustomizedDm.pas' {rmHaBaiCustomizedData: TDataModule},
+  BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
+  DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm};
 
 {$R *.res}
 

Dprs/Pro/Measure_Cloud.cfg

@@ -31,10 +31,10 @@
 -M
 -$M16384,1048576
 -K$00400000
--E"E:\SmartCostExe\Measure"
+-E"D:\SmartCostExe\Measure"
 -N"..\..\Dcus"
--LE"d:\program files (x86)\borland\delphi7\Projects\Bpl"
--LN"d:\program files (x86)\borland\delphi7\Projects\Bpl"
+-LE"c:\program files (x86)\borland\delphi7\Projects\Bpl"
+-LN"c:\program files (x86)\borland\delphi7\Projects\Bpl"
 -D_mCloud;_mEncrypt;
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE

Dprs/Pro/Measure_Cloud.dof

@@ -90,7 +90,7 @@ MaxStackSize=1048576
 ImageBase=4194304
 ExeDescription=
 [Directories]
-OutputDir=E:\SmartCostExe\Measure
+OutputDir=D:\SmartCostExe\Measure
 UnitOutputDir=..\..\Dcus
 PackageDLLOutputDir=
 PackageDCPOutputDir=
@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=3
-Build=1031
+Build=3003
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化云版
-FileVersion=3.1.3.1031
+FileVersion=3.1.3.3003
 InternalName=Measure
 LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
 LegalTrademarks=Measure
@@ -134,6 +134,9 @@ OriginalFilename=
 ProductName=纵横公路工程计量决算一体化软件
 ProductVersion=3
 Comments=
+[Excluded Packages]
+C:\Program Files (x86)\Borland\Delphi7\Lib\3F\Developer Express Inc\ExpressEditors Library 5\Delphi 7\Bin\dclcxEditorsVCLD7.bpl=ExpressEditors Library 5 (VCL Edition) by Developer Express Inc.
+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=5
 Item0=_mCloud;_mEncrypt;
@@ -150,10 +153,11 @@ Item0=..\..\Dcus
 Item1=E:\DelphiTemp
 Item2=D:\Dcu
 [HistoryLists\hlOutputDirectorry]
-Count=3
-Item0=E:\SmartCostExe\Measure
-Item1=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(云版)
-Item2=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(专业版)
+Count=4
+Item0=D:\SmartCostExe\Measure
+Item1=E:\SmartCostExe\Measure
+Item2=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(云版)
+Item3=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(专业版)
 [HistoryLists\hlBPLOutput]
 Count=1
 Item0=..\Bin

Dprs/Pro/Measure_Cloud.dpr

@@ -139,7 +139,18 @@ uses
   rmMentalCustomized1Dm in '..\..\DataModules\ReportMemoryDm\rmMentalCustomized1Dm.pas' {rmMentalCustomized1Data: TDataModule},
   rmGcl_XmjBillsDm in '..\..\DataModules\ReportMemoryDm\rmGcl_XmjBillsDm.pas' {rmGcl_XmjBillsData: TDataModule},
   rmCustomized2Dm in '..\..\DataModules\ReportMemoryDm\rmCustomized2Dm.pas' {rmCustomized2Data: TDataModule},
-  CalcDecimal in '..\..\Units\CalcDecimal.pas';
+  CalcDecimal in '..\..\Units\CalcDecimal.pas',
+  ProjectGLDm in '..\..\DataModules\ProjectGLDm.pas' {ProjectGLData: TDataModule},
+  PriceMarginBillsDm in '..\..\DataModules\PriceMarginBillsDm.pas' {PriceMarginBillsData: TDataModule},
+  GclBillsGatherModel in '..\..\Units\GclBillsGatherModel.pas',
+  DetailGLDm in '..\..\DataModules\DetailGLDm.pas' {DetailGLData: TDataModule},
+  PriceMarginBillsFme in '..\..\Frames\PriceMarginBillsFme.pas' {PriceMarginBillsFrame: TFrame},
+  PriceMarginFme in '..\..\Frames\PriceMarginFme.pas' {PriceMarginFrame: TFrame},
+  ProjectGLFme in '..\..\Frames\ProjectGLFme.pas' {ProjectGLFrame: TFrame},
+  SelectDetailGLsFrm in '..\..\Forms\SelectDetailGLsFrm.pas' {SelectDetailGLsForm},
+  rmHaBaiCustomizedDm in '..\..\DataModules\ReportMemoryDm\rmHaBaiCustomizedDm.pas' {rmHaBaiCustomizedData: TDataModule},
+  BillsPasteSelectFrm in '..\..\Forms\BillsPasteSelectFrm.pas' {BillsPasteSelectForm},
+  DealPayPlanFrm in '..\..\Forms\DealPayPlanFrm.pas' {DealPayPlanForm};
 
 {$R *.res}