From e50aa0608755bb4fbb2729912850b6ba4a5c75bc Mon Sep 17 00:00:00 2001
From: tangxu <76880903@qq.com>
Date: 星期四, 03 十一月 2022 21:42:16 +0800
Subject: [PATCH] 添加 三个取水泵房
---
Calculation/IStation.Calculation.Dispatch/helper/DispatchAnaGeneralHelper压力.cs | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git "a/Calculation/IStation.Calculation.Dispatch/helper/DispatchAnaGeneralHelper\345\216\213\345\212\233.cs" "b/Calculation/IStation.Calculation.Dispatch/helper/DispatchAnaGeneralHelper\345\216\213\345\212\233.cs"
index 6f3deb5..ee08c21 100644
--- "a/Calculation/IStation.Calculation.Dispatch/helper/DispatchAnaGeneralHelper\345\216\213\345\212\233.cs"
+++ "b/Calculation/IStation.Calculation.Dispatch/helper/DispatchAnaGeneralHelper\345\216\213\345\212\233.cs"
@@ -82,6 +82,7 @@
/// <param name="MaxQ"></param>
/// <param name="pipeMachineList"></param>
/// <param name="MachineRunFilterList"></param>
+ /// <param name="error_info"></param>
/// <returns></returns>
public bool InitialParas(
double targetQ,
@@ -89,7 +90,8 @@
double outlet_para,bool outlet_is_waterlevel,
string MinQ, string MaxQ,
List<IStation.Calculation.DispatchAna.Model.MachineDetail> pipeMachineList,
- List<IStation.Calculation.DispatchAna.Model.MachineRunFilter> MachineRunFilterList)
+ List<IStation.Calculation.DispatchAna.Model.MachineRunFilter> MachineRunFilterList,
+ out string error_info)
{
if (inlet_is_waterlevel)
{
@@ -110,6 +112,17 @@
}
this._targetQ = targetQ;
+ if (targetQ < 10)
+ {
+ error_info = "娴侀噺鍊艰繃浣庢棤娉曞垎鏋�";
+ return false;
+ }
+ if(this._targetOutletPress<= this._targetInletPress + 0.01)
+ {
+ error_info = "杩涘嚭鍙ｅ帇鍔涘�艰缃笉鍚堢悊";
+ return false;
+ }
+
this._allMachineList = pipeMachineList;
@@ -161,7 +174,7 @@
InitialFilter(MachineRunFilterList);
-
+ error_info = null;
return true;
}
--
Gitblit v1.9.3