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

Frames/ZJJLFme.pas

@@ -190,14 +190,8 @@ end;
 
 procedure TZJJLFrame.actnGenerateFxZJJLExecute(Sender: TObject);
 begin
-  with TPhaseData(FZJJLData.PhaseData).PhaseProperty do
-  begin
-    if (ZJJLType = 0) or QuestMessage('当前为“总量控制”格式，切换至“0号台账”将清空数据并重新生成，确定要切换吗？') then
-    begin
-      ZJJLType := 0;
-      GenerateZJJL;
-    end;
-  end;
+  TPhaseData(FZJJLData.PhaseData).PhaseProperty.ZJJLType := 0;
+  GenerateZJJL;
 end;
 
 procedure TZJJLFrame.GenerateZJJL;
@@ -220,14 +214,8 @@ end;
 
 procedure TZJJLFrame.actnGenerateGclZJJLExecute(Sender: TObject);
 begin
-  with TPhaseData(FZJJLData.PhaseData).PhaseProperty do
-  begin
-    if (ZJJLType = 1) or (QuestMessage('当前为“0号台账”格式，切换至“总量控制”将清空数据并重新生成，确定要切换吗？')) then
-    begin
-      ZJJLType := 1;
-      GenerateZJJL;
-    end;
-  end;
+  TPhaseData(FZJJLData.PhaseData).PhaseProperty.ZJJLType := 1;
+  GenerateZJJL;
 end;
 
 procedure TZJJLFrame.actnGenerateUpdate(Sender: TObject);