From d5a533d045422407c1b7edfdde9fd19740e478d1 Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期二, 27 六月 2023 09:34:58 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/IStation/Service.V4.1
---
Calculation/IStation.Calculation.Dispatch/general/KeepStatus.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Calculation/IStation.Calculation.Dispatch/general/KeepStatus.cs b/Calculation/IStation.Calculation.Dispatch/general/KeepStatus.cs
index c73b3db..670d119 100644
--- a/Calculation/IStation.Calculation.Dispatch/general/KeepStatus.cs
+++ b/Calculation/IStation.Calculation.Dispatch/general/KeepStatus.cs
@@ -73,9 +73,9 @@
}
double water_level = 0;//姘翠綅
- if (_request_paras.WaterLevelPara != null && _request_paras.WaterLevelPara.Count > 0)
+ if (_request_paras.InletPipePara != null && _request_paras.InletPipePara.Count > 0)
{
- water_level = _request_paras.WaterLevelPara.First().Value;
+ water_level = _request_paras.InletPipePara.First().Value;
}
if (_request_paras.ValvePara == null || _request_paras.ValvePara.Count < 1)
@@ -97,11 +97,11 @@
new IStation.Calculation.DispatchAna.Common.DispatchAnaGeneralHelper鍘嬪姏();
calc_pipe_helper.InitialParas(
target_flow,
- water_level,
- target_press,
+ water_level,true,
+ target_press,false,
_request_paras.OutletPipePara[0].TargetFlowRangeMin,
_request_paras.OutletPipePara[0].TargetFlowRangeMax,
- allMachineList, null);
+ allMachineList, null, out error_info);
return calc_pipe_helper.CalcKeepStatus(_open_machine_IdList);
}
--
Gitblit v1.9.3