Merge branch 'master' of http://192.168.1.12:3000/MaiXinRong/Measure

DataModules/ReportMemoryDm/rmGclBillsBGDm.pas

@@ -152,6 +152,10 @@ begin
       WriteFlowBills;
   finally
     ClearObjects(FGclList);
+    if FrmGatherType = rmgtGather then
+      cdsBills.IndexFieldNames := 'IndexCode'
+    else if FrmGatherType = rmgtFlow then
+      cdsBills.IndexFieldNames := 'SerialNo;IndexCode';
     cdsBills.EnableControls;
     Result := cdsBills;
   end;

Frames/ProjectFme.pas

@@ -1529,6 +1529,7 @@ begin
     tobtnZJJL.Down := True;
     tobtnZJJL.Click;
   end;
+  FZJJLFrame.GenerateZJJL;
 end;
 
 procedure TProjectFrame.actnAllPegExecute(Sender: TObject);

Frames/ZJJLFme.pas

@@ -68,7 +68,6 @@ type
 
     procedure RefreshTitle;
     procedure RefreshDetailGrid;
-    procedure GenerateZJJL;
 
     procedure InitDetailGrid;
   public
@@ -76,6 +75,7 @@ type
     destructor Destroy; override;
 
     procedure ResetFrameLink(AZJJLData: TZJJLData);
+    procedure GenerateZJJL;
 
     property DataReadOnly: Boolean read FDataReadOnly write SetDataReadOnly;
   end;