Browse Source

PrintCom: bills limit

MaiXinRong 8 năm trước cách đây
mục cha
commit
f54daaaad1

+ 70 - 4
DataModules/ReportMemoryDm/rmWeiWuZjjlGatherDm.dfm

@@ -2,8 +2,8 @@ object rmWeiWuZjjlGatherData: TrmWeiWuZjjlGatherData
   OldCreateOrder = False
   Left = 192
   Top = 123
-  Height = 150
-  Width = 215
+  Height = 131
+  Width = 234
   object cdsZjjl: TClientDataSet
     Active = True
     Aggregates = <>
@@ -176,6 +176,40 @@ object rmWeiWuZjjlGatherData: TrmWeiWuZjjlGatherData
         Name = 'DanWeiName'
         DataType = ftWideString
         Size = 255
+      end
+      item
+        Name = 'ProjectName'
+        DataType = ftWideString
+        Size = 255
+      end
+      item
+        Name = 'DealCode'
+        DataType = ftWideString
+        Size = 50
+      end
+      item
+        Name = 'CName'
+        DataType = ftWideString
+        Size = 50
+      end
+      item
+        Name = 'SName'
+        DataType = ftWideString
+        Size = 50
+      end
+      item
+        Name = 'PhaseIndex'
+        DataType = ftWideString
+        Size = 20
+      end
+      item
+        Name = 'DealName'
+        DataType = ftWideString
+        Size = 50
+      end
+      item
+        Name = 'FlowIndex'
+        DataType = ftInteger
       end>
     IndexDefs = <>
     Params = <>
@@ -183,7 +217,7 @@ object rmWeiWuZjjlGatherData: TrmWeiWuZjjlGatherData
     Left = 64
     Top = 32
     Data = {
-      9A0400009619E0BD0100000018000000260000000000030000009A0404436F64
+      590500009619E0BD01000000180000002D000000000003000000590504436F64
       6501004A00000001000557494454480200020064000F43657274696669636174
       65436F646501004A00000001000557494454480200020064000742474C436F64
       6504004B00000002000753554254595045020049000500546578740005574944
@@ -219,7 +253,13 @@ object rmWeiWuZjjlGatherData: TrmWeiWuZjjlGatherData
       6F74616C507269636508000400000000000D42696C6C735175616E7469747908
       000400000000000F42696C6C73546F74616C5072696365080004000000000009
       46656E42754E616D6501004A00000001000557494454480200020064000A4461
-      6E5765694E616D6502004A000000010005574944544802000200FE010000}
+      6E5765694E616D6502004A000000010005574944544802000200FE010B50726F
+      6A6563744E616D6502004A000000010005574944544802000200FE0108446561
+      6C436F646501004A000000010005574944544802000200640005434E616D6501
+      004A000000010005574944544802000200640005534E616D6501004A00000001
+      000557494454480200020064000A5068617365496E64657801004A0000000100
+      055749445448020002002800084465616C4E616D6501004A0000000100055749
+      44544802000200640009466C6F77496E64657804000100000000000000}
     object cdsZjjlCode: TWideStringField
       FieldName = 'Code'
       Size = 50
@@ -354,5 +394,31 @@ object rmWeiWuZjjlGatherData: TrmWeiWuZjjlGatherData
       FieldName = 'DanWeiName'
       Size = 255
     end
+    object cdsZjjlProjectName: TWideStringField
+      FieldName = 'ProjectName'
+      Size = 255
+    end
+    object cdsZjjlDealCode: TWideStringField
+      FieldName = 'DealCode'
+      Size = 50
+    end
+    object cdsZjjlCName: TWideStringField
+      FieldName = 'CName'
+      Size = 50
+    end
+    object cdsZjjlSName: TWideStringField
+      FieldName = 'SName'
+      Size = 50
+    end
+    object cdsZjjlPhaseIndex: TWideStringField
+      FieldName = 'PhaseIndex'
+    end
+    object cdsZjjlDealName: TWideStringField
+      FieldName = 'DealName'
+      Size = 50
+    end
+    object cdsZjjlFlowIndex: TIntegerField
+      FieldName = 'FlowIndex'
+    end
   end
 end

+ 17 - 2
DataModules/ReportMemoryDm/rmWeiWuZjjlGatherDm.pas

@@ -101,6 +101,13 @@ type
     cdsZjjlBillsTotalPrice: TFloatField;
     cdsZjjlFenBuName: TWideStringField;
     cdsZjjlDanWeiName: TWideStringField;
+    cdsZjjlProjectName: TWideStringField;
+    cdsZjjlDealCode: TWideStringField;
+    cdsZjjlCName: TWideStringField;
+    cdsZjjlSName: TWideStringField;
+    cdsZjjlPhaseIndex: TWideStringField;
+    cdsZjjlDealName: TWideStringField;
+    cdsZjjlFlowIndex: TIntegerField;
   private
     FZjjlList: TList;
     FPreText: string;
@@ -108,7 +115,7 @@ type
     function FindZjjl(ARec: TsdDataRecord; ANode: TBillsIDTreeNode): TZjjl;
 
     procedure GatherZjjl(AProjectData: TProjectData);
-    procedure WriteData;
+    procedure WriteData(AProjectData: TProjectData);
   public
     function AssignData(AProjectData: TProjectData): TDataSet;
   end;
@@ -341,7 +348,7 @@ begin
       FPhaseIndex := AProjectData.PhaseIndex;
       GatherZjjl(AProjectData);
       FZjjlList.Sort(@IndexCodeCompare);
-      WriteData;
+      WriteData(AProjectData);
     end;
     Result := cdsZjjl;
   finally
@@ -479,6 +486,14 @@ begin
     cdsZjjlFenBuName.AsString := vZ.FFenBuName;
     cdsZjjlDanWeiName.AsString := vZ.FDanWeiName;
 
+    cdsZjjlProjectName.AsString := AProjectData.ProjProperties.ProjectName;
+    cdsZjjlDealCode.AsString := AProjectData.ProjProperties.DealIndex;
+    cdsZjjlCName.AsString := AProjectData.ProjProperties.CName;
+    cdsZjjlSName.AsString := AProjectData.ProjProperties.SName;
+    cdsZjjlPhaseIndex.AsString := Format('%d ÆÚ', [AProjectData.PhaseIndex]);
+    cdsZjjlDealName.AsString := AProjectData.ProjProperties.DealName;
+    cdsZjjlFlowIndex.AsInteger := 0;
+
     cdsZjjl.Post;
   end;
 end;