汇总，变更令汇总数据增加汇总交投专用数据

DataModules/BGLDm.pas

@@ -269,7 +269,7 @@ begin
   cdsBGL.AddIndex('idxCode', 'Code', []);
   cdsBGL.IndexName := 'idxID';
   cdsBGLView.CloneCursor(cdsBGL, True);
-  cdsBGLView.CloneCursor(cdsBGL, True);
+  cdsScjtBGlView.CloneCursor(cdsBGL, True);
 
   atBGBills.Connection := AConnection;
   cdsBGBills.Open;

Report/ProjGather/rProjGatherTables.pas

@@ -272,7 +272,7 @@ const
   );
 
   SBGL_TransProj = 'r_BGL_TransProj';
-  tdBGL_TransProj: array [0..10] of TScFieldDef =(
+  tdBGL_TransProj: array [0..17] of TScFieldDef =(
     // 与Bills表ID对应
     (FieldName: 'ID'; FieldType: ftInteger; Size: 0; Precision: 0; NotNull: True; PrimaryKey: True; ForceUpdate: False),
     // 对应于r_GatherProj中的ID字段
@@ -295,7 +295,25 @@ const
     // 批准文号
     (FieldName: 'ApprovalCode'; FieldType: ftString; Size: 50; Precision: 0; NotNull: False; PrimaryKey: False; ForceUpdate: False),
     // 变更令类型：一般、较大、重大
-    (FieldName: 'BGLType'; FieldType: ftString; Size: 10; Precision: 0; NotNull: False; PrimaryKey: False; ForceUpdate: False)
+    (FieldName: 'BGLType'; FieldType: ftString; Size: 10; Precision: 0; NotNull: False; PrimaryKey: False; ForceUpdate: False),
+    {------------------------------- 四川交投 -------------------------------}
+    // 桩号或部位
+    (FieldName: 'Peg'; FieldType: ftString; Size: 50; Precision: 0; NotNull: False; PrimaryKey: False; ForceUpdate: False),
+    // 变更实际实施时间
+    (FieldName: 'StartDateTime'; FieldType: ftString; Size: 50; Precision: 0; NotNull: False; PrimaryKey: False; ForceUpdate: False),
+    // 变更立项审核
+    // 立项审核表编号
+    (FieldName: 'LxCode'; FieldType: ftString; Size: 50; Precision: 0; NotNull: False; PrimaryKey: False; ForceUpdate: False),
+    // 预估金额
+    (FieldName: 'LxTotalPrice'; FieldType: ftDouble; Size: 0; Precision: 0; NotNull: False; PrimaryKey: False; ForceUpdate: False),
+    // 变更立项批复
+    // 变更立项批复
+    (FieldName: 'PfCode'; FieldType: ftString; Size: 50; Precision: 0; NotNull: False; PrimaryKey: False; ForceUpdate: False),
+    // 批复金额
+    (FieldName: 'PfTotalPrice'; FieldType: ftDouble; Size: 0; Precision: 0; NotNull: False; PrimaryKey: False; ForceUpdate: False),
+    // 备注
+    (FieldName: 'MemoStr'; FieldType: ftString; Size: 255; Precision: 0; NotNull: False; PrimaryKey: False; ForceUpdate: False)
+    {------------------------------------------------------------------------}
   );
 
 implementation

Report/ProjGather/rpgGatherData.pas

@@ -209,7 +209,8 @@ procedure TrpgGatherData.CopyBGLData(const AFileName: string; AProjIndex, AProjT
 const
   sCopyBGL = 'Insert Into r_BGL_TransProj' +
              '  Select ID, %d As ProjID, %d As ProjType,' +
-             '    Code, Name, TotalPrice, Pos_Reason, Direction, DrawingCode, ApprovalCode, BGLType' +
+             '    Code, Name, TotalPrice, Pos_Reason, Direction, DrawingCode, ApprovalCode, BGLType,' +
+             '    Peg, StartDateTime, LxCode, LxTotalPrice, PfCode, PfTotalPrice, MemoStr' +
              '  From BGL In ''%s''';
 begin
   ExecuteSql(FConnection, Format(sCopyBGL, [AProjIndex, AProjType, AFileName]));