Merge branch 'master' of http://192.168.1.41:3000/maixinrong/measure

Dprs/Debug/Measure_Debug.dpr

@@ -253,7 +253,10 @@ uses
   stgGclTables in '..\..\SubTenderGatherGcl\stgGclTables.pas',
   stgGclImportHintFrm in '..\..\SubTenderGatherGcl\stgGclImportHintFrm.pas' {stgGclImportHintForm},
   stgGclGather in '..\..\SubTenderGatherGcl\stgGclGather.pas',
-  stgGclSelectFileFrm in '..\..\SubTenderGatherGcl\stgGclSelectFileFrm.pas' {stgGclSelectFileForm};
+  stgGclSelectFileFrm in '..\..\SubTenderGatherGcl\stgGclSelectFileFrm.pas' {stgGclSelectFileForm},
+  rmBGBillsGatherDm in '..\..\DataModules\ReportMemoryDm\rmBGBillsGatherDm.pas' {rmBGBillsGatherData: TDataModule},
+  rmBillsPhaseGatherDm in '..\..\DataModules\ReportMemoryDm\rmBillsPhaseGatherDm.pas' {rmBillsPhaseGatherData: TDataModule},
+  rmfImportFrm in '..\..\Forms\rmfImportFrm.pas' {rmfImportForm};
 
 {$R *.res}
 

Dprs/PWFree/Measure_Cloud.cfg

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

Dprs/PWFree/Measure_Cloud.dof

@@ -90,7 +90,7 @@ MaxStackSize=1048576
 ImageBase=4194304
 ExeDescription=
 [Directories]
-OutputDir=D:\SmartCostExe\Measure\PWFree
+OutputDir=E:\SmartCostExe\Measure\PWFree
 UnitOutputDir=..\..\Dcus
 PackageDLLOutputDir=
 PackageDCPOutputDir=
@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=7
-Build=2370
+Build=2400
 Debug=0
 PreRelease=0
 Special=0
@@ -126,16 +126,13 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化云版
-FileVersion=3.1.7.2370
+FileVersion=3.1.7.2400
 InternalName=
 LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
 LegalTrademarks=Measure
 OriginalFilename=
 ProductName=纵横公路工程结算决算一体化软件
 ProductVersion=3.1.7
-[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=4
 Item0=_mCloud;_mLoginNoPW;
@@ -149,6 +146,7 @@ Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
 Count=1
 Item0=..\..\Dcus
 [HistoryLists\hlOutputDirectorry]
-Count=2
-Item0=D:\SmartCostExe\Measure\PWFree
-Item1=D:\SmartCostExe\Measure
+Count=3
+Item0=E:\SmartCostExe\Measure\PWFree
+Item1=D:\SmartCostExe\Measure\PWFree
+Item2=D:\SmartCostExe\Measure

Dprs/PWFree/Measure_Cloud.dpr

@@ -258,7 +258,10 @@ uses
   stgGclTables in '..\..\SubTenderGatherGcl\stgGclTables.pas',
   stgGclImportHintFrm in '..\..\SubTenderGatherGcl\stgGclImportHintFrm.pas' {stgGclImportHintForm},
   stgGclGather in '..\..\SubTenderGatherGcl\stgGclGather.pas',
-  stgGclSelectFileFrm in '..\..\SubTenderGatherGcl\stgGclSelectFileFrm.pas' {stgGclSelectFileForm};
+  stgGclSelectFileFrm in '..\..\SubTenderGatherGcl\stgGclSelectFileFrm.pas' {stgGclSelectFileForm},
+  rmBGBillsGatherDm in '..\..\DataModules\ReportMemoryDm\rmBGBillsGatherDm.pas' {rmBGBillsGatherData: TDataModule},
+  rmBillsPhaseGatherDm in '..\..\DataModules\ReportMemoryDm\rmBillsPhaseGatherDm.pas' {rmBillsPhaseGatherData: TDataModule},
+  rmfImportFrm in '..\..\Forms\rmfImportFrm.pas' {rmfImportForm};
 
 {$R *.res}
 

Dprs/Pro/Measure.cfg

@@ -31,10 +31,10 @@
 -M
 -$M16384,1048576
 -K$00400000
--E"D:\SmartCostExe\Measure"
+-E"E:\SmartCostExe\Measure"
 -N"..\..\Dcus"
--LE"c:\program files (x86)\borland\delphi7\Projects\Bpl"
--LN"c:\program files (x86)\borland\delphi7\Projects\Bpl"
+-LE"e:\program files (x86)\borland\delphi7\Projects\Bpl"
+-LN"e:\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=D:\SmartCostExe\Measure
+OutputDir=E:\SmartCostExe\Measure
 UnitOutputDir=..\..\Dcus
 PackageDLLOutputDir=
 PackageDCPOutputDir=
@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=7
-Build=2370
+Build=2400
 Debug=0
 PreRelease=0
 Special=0
@@ -126,16 +126,13 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化专业版
-FileVersion=3.1.7.2370
+FileVersion=3.1.7.2400
 InternalName=
 LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
 LegalTrademarks=Measure
 OriginalFilename=
 ProductName=纵横公路工程结算决算一体化软件
 ProductVersion=3.1.7
-[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=1
 Item0=_mEncrypt;
@@ -146,7 +143,8 @@ Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
 Count=1
 Item0=..\..\Dcus
 [HistoryLists\hlOutputDirectorry]
-Count=3
-Item0=D:\SmartCostExe\Measure
-Item1=D:\Program Files (x86)\纵横软件\纵横结算决算计量一体化软件(专业版)
-Item2=D:\Program Files (x86)\纵横软件\纵横结算决算计量一体化软件(云版)
+Count=4
+Item0=E:\SmartCostExe\Measure
+Item1=D:\SmartCostExe\Measure
+Item2=D:\Program Files (x86)\纵横软件\纵横结算决算计量一体化软件(专业版)
+Item3=D:\Program Files (x86)\纵横软件\纵横结算决算计量一体化软件(云版)

Dprs/Pro/Measure.dpr

@@ -251,7 +251,10 @@ uses
   stgGclTables in '..\..\SubTenderGatherGcl\stgGclTables.pas',
   stgGclImportHintFrm in '..\..\SubTenderGatherGcl\stgGclImportHintFrm.pas' {stgGclImportHintForm},
   stgGclGather in '..\..\SubTenderGatherGcl\stgGclGather.pas',
-  stgGclSelectFileFrm in '..\..\SubTenderGatherGcl\stgGclSelectFileFrm.pas' {stgGclSelectFileForm};
+  stgGclSelectFileFrm in '..\..\SubTenderGatherGcl\stgGclSelectFileFrm.pas' {stgGclSelectFileForm},
+  rmBGBillsGatherDm in '..\..\DataModules\ReportMemoryDm\rmBGBillsGatherDm.pas' {rmBGBillsGatherData: TDataModule},
+  rmBillsPhaseGatherDm in '..\..\DataModules\ReportMemoryDm\rmBillsPhaseGatherDm.pas' {rmBillsPhaseGatherData: TDataModule},
+  rmfImportFrm in '..\..\Forms\rmfImportFrm.pas' {rmfImportForm};
 
 {$R *.res}
 

Dprs/Pro/Measure_Cloud.cfg

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

Dprs/Pro/Measure_Cloud.dof

@@ -90,7 +90,7 @@ MaxStackSize=1048576
 ImageBase=4194304
 ExeDescription=
 [Directories]
-OutputDir=D:\SmartCostExe\Measure
+OutputDir=E:\SmartCostExe\Measure
 UnitOutputDir=..\..\Dcus
 PackageDLLOutputDir=
 PackageDCPOutputDir=
@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=7
-Build=2369
+Build=2400
 Debug=0
 PreRelease=0
 Special=0
@@ -126,16 +126,13 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化云版
-FileVersion=3.1.7.2369
+FileVersion=3.1.7.2400
 InternalName=
 LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
 LegalTrademarks=Measure
 OriginalFilename=
 ProductName=纵横公路工程结算决算一体化软件
 ProductVersion=3.1.7
-[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=4
 Item0=_mCloud;
@@ -149,6 +146,7 @@ Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
 Count=1
 Item0=..\..\Dcus
 [HistoryLists\hlOutputDirectorry]
-Count=2
-Item0=D:\SmartCostExe\Measure
-Item1=D:\Program Files (x86)\纵横软件\纵横结算决算计量一体化软件(云版)1
+Count=3
+Item0=E:\SmartCostExe\Measure
+Item1=D:\SmartCostExe\Measure
+Item2=D:\Program Files (x86)\纵横软件\纵横结算决算计量一体化软件(云版)1

Dprs/Pro/Measure_Cloud.dpr

@@ -258,7 +258,10 @@ uses
   stgGclTables in '..\..\SubTenderGatherGcl\stgGclTables.pas',
   stgGclImportHintFrm in '..\..\SubTenderGatherGcl\stgGclImportHintFrm.pas' {stgGclImportHintForm},
   stgGclGather in '..\..\SubTenderGatherGcl\stgGclGather.pas',
-  stgGclSelectFileFrm in '..\..\SubTenderGatherGcl\stgGclSelectFileFrm.pas' {stgGclSelectFileForm};
+  stgGclSelectFileFrm in '..\..\SubTenderGatherGcl\stgGclSelectFileFrm.pas' {stgGclSelectFileForm},
+  rmBGBillsGatherDm in '..\..\DataModules\ReportMemoryDm\rmBGBillsGatherDm.pas' {rmBGBillsGatherData: TDataModule},
+  rmBillsPhaseGatherDm in '..\..\DataModules\ReportMemoryDm\rmBillsPhaseGatherDm.pas' {rmBillsPhaseGatherData: TDataModule},
+  rmfImportFrm in '..\..\Forms\rmfImportFrm.pas' {rmfImportForm};
 
 {$R *.res}
 

Dprs/Pro/Measure_GuangDong.cfg

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

Dprs/Pro/Measure_GuangDong.dof

@@ -90,7 +90,7 @@ MaxStackSize=1048576
 ImageBase=4194304
 ExeDescription=
 [Directories]
-OutputDir=D:\SmartCostExe\Measure
+OutputDir=E:\SmartCostExe\Measure
 UnitOutputDir=..\..\Dcus
 PackageDLLOutputDir=
 PackageDCPOutputDir=
@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=7
-Build=2370
+Build=2400
 Debug=0
 PreRelease=0
 Special=0
@@ -126,16 +126,13 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化广东专业版
-FileVersion=3.1.7.2370
+FileVersion=3.1.7.2400
 InternalName=
 LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
 LegalTrademarks=Measure
 OriginalFilename=
 ProductName=纵横公路工程结算决算一体化软件
 ProductVersion=3.1.7
-[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=1
 Item0=_mEncrypt;_mGuangDong
@@ -146,6 +143,7 @@ Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
 Count=1
 Item0=..\..\Dcus
 [HistoryLists\hlOutputDirectorry]
-Count=2
-Item0=D:\SmartCostExe\Measure
-Item1=E:\资料\软件安装文件\纵横结算决算计量一体化软件(专业版)
+Count=3
+Item0=E:\SmartCostExe\Measure
+Item1=D:\SmartCostExe\Measure
+Item2=E:\资料\软件安装文件\纵横结算决算计量一体化软件(专业版)

Dprs/Pro/Measure_GuangDong.dpr

@@ -251,7 +251,10 @@ uses
   stgGclTables in '..\..\SubTenderGatherGcl\stgGclTables.pas',
   stgGclImportHintFrm in '..\..\SubTenderGatherGcl\stgGclImportHintFrm.pas' {stgGclImportHintForm},
   stgGclGather in '..\..\SubTenderGatherGcl\stgGclGather.pas',
-  stgGclSelectFileFrm in '..\..\SubTenderGatherGcl\stgGclSelectFileFrm.pas' {stgGclSelectFileForm};
+  stgGclSelectFileFrm in '..\..\SubTenderGatherGcl\stgGclSelectFileFrm.pas' {stgGclSelectFileForm},
+  rmBGBillsGatherDm in '..\..\DataModules\ReportMemoryDm\rmBGBillsGatherDm.pas' {rmBGBillsGatherData: TDataModule},
+  rmBillsPhaseGatherDm in '..\..\DataModules\ReportMemoryDm\rmBillsPhaseGatherDm.pas' {rmBillsPhaseGatherData: TDataModule},
+  rmfImportFrm in '..\..\Forms\rmfImportFrm.pas' {rmfImportForm};
 
 {$R *.res}
 

Dprs/Pro/Measure_GuangDong_Cloud.cfg

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

Dprs/Pro/Measure_GuangDong_Cloud.dof

@@ -90,7 +90,7 @@ MaxStackSize=1048576
 ImageBase=4194304
 ExeDescription=
 [Directories]
-OutputDir=D:\SmartCostExe\Measure
+OutputDir=E:\SmartCostExe\Measure
 UnitOutputDir=..\..\Dcus
 PackageDLLOutputDir=
 PackageDCPOutputDir=
@@ -115,7 +115,7 @@ AutoIncBuild=0
 MajorVer=3
 MinorVer=1
 Release=7
-Build=2368
+Build=2399
 Debug=0
 PreRelease=0
 Special=0
@@ -126,15 +126,13 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化广东云版
-FileVersion=3.1.7.2368
+FileVersion=3.1.7.2399
 InternalName=
 LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
 LegalTrademarks=Measure
 OriginalFilename=
 ProductName=纵横公路工程结算决算一体化软件
 ProductVersion=3.1.7.1
-[Excluded Packages]
-c:\program files (x86)\borland\delphi7\Bin\DBWEBXPRT.BPL=Borland Web Wizard Package
 [HistoryLists\hlConditionals]
 Count=1
 Item0=_mCloud;_mGuangDong
@@ -146,6 +144,7 @@ Count=2
 Item0=..\..\Dcus
 Item1=C:\DelphiTemp
 [HistoryLists\hlOutputDirectorry]
-Count=2
-Item0=D:\SmartCostExe\Measure
-Item1=C:\Program Files (x86)\纵横软件\纵横结算决算计量一体化软件(广东云版)
+Count=3
+Item0=E:\SmartCostExe\Measure
+Item1=D:\SmartCostExe\Measure
+Item2=C:\Program Files (x86)\纵横软件\纵横结算决算计量一体化软件(广东云版)

Dprs/Pro/Measure_GuangDong_Cloud.dpr

@@ -258,7 +258,10 @@ uses
   stgGclTables in '..\..\SubTenderGatherGcl\stgGclTables.pas',
   stgGclImportHintFrm in '..\..\SubTenderGatherGcl\stgGclImportHintFrm.pas' {stgGclImportHintForm},
   stgGclGather in '..\..\SubTenderGatherGcl\stgGclGather.pas',
-  stgGclSelectFileFrm in '..\..\SubTenderGatherGcl\stgGclSelectFileFrm.pas' {stgGclSelectFileForm};
+  stgGclSelectFileFrm in '..\..\SubTenderGatherGcl\stgGclSelectFileFrm.pas' {stgGclSelectFileForm} ,
+  rmBGBillsGatherDm in '..\..\DataModules\ReportMemoryDm\rmBGBillsGatherDm.pas' {rmBGBillsGatherData: TDataModule},
+  rmBillsPhaseGatherDm in '..\..\DataModules\ReportMemoryDm\rmBillsPhaseGatherDm.pas' {rmBillsPhaseGatherData: TDataModule},
+  rmfImportFrm in '..\..\Forms\rmfImportFrm.pas' {rmfImportForm};
 
 {$R *.res}
 

Dprs/Trail/Measure.cfg

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

Dprs/Trail/Measure.dof

@@ -90,7 +90,7 @@ MaxStackSize=1048576
 ImageBase=4194304
 ExeDescription=
 [Directories]
-OutputDir=D:\SmartCostExe\MeasureTrail
+OutputDir=E:\SmartCostExe\MeasureTrail
 UnitOutputDir=..\..\Dcus
 PackageDLLOutputDir=
 PackageDCPOutputDir=
@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=7
-Build=2369
+Build=2400
 Debug=0
 PreRelease=0
 Special=0
@@ -126,16 +126,13 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化学习版
-FileVersion=3.1.7.2369
+FileVersion=3.1.7.2400
 InternalName=
 LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
 LegalTrademarks=Measure
 OriginalFilename=
 ProductName=纵横公路工程结算决算一体化软件
 ProductVersion=3.1.7
-[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=9
 Item0=_mEncrypt;cplPrint;cplOutputToExcelRange
@@ -156,9 +153,9 @@ Item0=..\..\Dcus
 Item1=..\Dcus
 [HistoryLists\hlOutputDirectorry]
 Count=11
-Item0=D:\SmartCostExe\MeasureTrail
-Item1=E:\资料\软件安装文件\纵横结算决算计量一体化软件(专业版)
-Item2=E:\SmartCostExe\MeasureTrail
+Item0=E:\SmartCostExe\MeasureTrail
+Item1=D:\SmartCostExe\MeasureTrail
+Item2=E:\资料\软件安装文件\纵横结算决算计量一体化软件(专业版)
 Item3=E:\SmartCostExe\Measure
 Item4=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(广东专业版)
 Item5=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(专业版)

Dprs/Trail/Measure.dpr

@@ -251,7 +251,10 @@ uses
   stgGclTables in '..\..\SubTenderGatherGcl\stgGclTables.pas',
   stgGclImportHintFrm in '..\..\SubTenderGatherGcl\stgGclImportHintFrm.pas' {stgGclImportHintForm},
   stgGclGather in '..\..\SubTenderGatherGcl\stgGclGather.pas',
-  stgGclSelectFileFrm in '..\..\SubTenderGatherGcl\stgGclSelectFileFrm.pas' {stgGclSelectFileForm};
+  stgGclSelectFileFrm in '..\..\SubTenderGatherGcl\stgGclSelectFileFrm.pas' {stgGclSelectFileForm},
+  rmBGBillsGatherDm in '..\..\DataModules\ReportMemoryDm\rmBGBillsGatherDm.pas' {rmBGBillsGatherData: TDataModule},
+  rmBillsPhaseGatherDm in '..\..\DataModules\ReportMemoryDm\rmBillsPhaseGatherDm.pas' {rmBillsPhaseGatherData: TDataModule},
+  rmfImportFrm in '..\..\Forms\rmfImportFrm.pas' {rmfImportForm};
 
 {$R *.res}
 

Dprs/Trail/Measure_GuangDong.cfg

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

Dprs/Trail/Measure_GuangDong.dof

@@ -90,7 +90,7 @@ MaxStackSize=1048576
 ImageBase=4194304
 ExeDescription=
 [Directories]
-OutputDir=D:\SmartCostExe\MeasureTrail
+OutputDir=E:\SmartCostExe\MeasureTrail
 UnitOutputDir=..\..\Dcus
 PackageDLLOutputDir=
 PackageDCPOutputDir=
@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=7
-Build=2369
+Build=2400
 Debug=0
 PreRelease=0
 Special=0
@@ -126,16 +126,13 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化广东学习版
-FileVersion=3.1.7.2369
+FileVersion=3.1.7.2400
 InternalName=
 LegalCopyright=版权所有（C）珠海纵横创新软件有限公司2003-2016
 LegalTrademarks=Measure
 OriginalFilename=
 ProductName=纵横结算决算计量一体化软件
 ProductVersion=3.1.7
-[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=12
 Item0=_mGuangDong
@@ -159,8 +156,8 @@ Item0=..\..\Dcus
 Item1=..\Dcus
 [HistoryLists\hlOutputDirectorry]
 Count=9
-Item0=D:\SmartCostExe\MeasureTrail
-Item1=E:\SmartCostExe\MeasureTrail
+Item0=E:\SmartCostExe\MeasureTrail
+Item1=D:\SmartCostExe\MeasureTrail
 Item2=E:\SmartCostExe\Measure
 Item3=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(专业版)
 Item4=D:\Program Files (x86)\纵横软件\纵横计量决算一体化软件(专业版2)

Dprs/Trail/Measure_GuangDong.dpr

@@ -251,7 +251,10 @@ uses
   stgGclTables in '..\..\SubTenderGatherGcl\stgGclTables.pas',
   stgGclImportHintFrm in '..\..\SubTenderGatherGcl\stgGclImportHintFrm.pas' {stgGclImportHintForm},
   stgGclGather in '..\..\SubTenderGatherGcl\stgGclGather.pas',
-  stgGclSelectFileFrm in '..\..\SubTenderGatherGcl\stgGclSelectFileFrm.pas' {stgGclSelectFileForm};
+  stgGclSelectFileFrm in '..\..\SubTenderGatherGcl\stgGclSelectFileFrm.pas' {stgGclSelectFileForm},
+  rmBGBillsGatherDm in '..\..\DataModules\ReportMemoryDm\rmBGBillsGatherDm.pas' {rmBGBillsGatherData: TDataModule},
+  rmBillsPhaseGatherDm in '..\..\DataModules\ReportMemoryDm\rmBillsPhaseGatherDm.pas' {rmBillsPhaseGatherData: TDataModule},
+  rmfImportFrm in '..\..\Forms\rmfImportFrm.pas' {rmfImportForm};
 
 {$R *.res}