From 05f522e321a742f03bf1e3e26edaeb5147da42f4 Mon Sep 17 00:00:00 2001
From: tangxu <76880903@qq.com>
Date: 星期三, 02 十一月 2022 16:18:47 +0800
Subject: [PATCH] 解决南汇北 计划计算

---
 Calculation/IStation.Calculation.Dispatch/helper/DispatchAnaGeneralHelper压力.cs |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 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 f4d3da2..4267493 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"
@@ -999,10 +999,23 @@
                 flow = Math.Round(flow, 1);
 
                 var head = IStation.Model.FitCurveHelper.GetFitPointY(ana_data.CurveInfoQH, Math.Round(flow, 1));
-                head = Math.Round(head, 1);
+                head = Math.Round(head, 2);
                 ana_data.WorkPointQ = flow;
                 ana_data.WorkPointH = head;
                 ana_data.WorkPointP = Math.Round(IStation.Model.FitCurveHelper.GetFitPointY(ana_data.CurveInfoQP, ana_data.WorkPointQ), 1);
+                if(ana_data.WorkPointP < 0.1)
+                {
+                    if(ana_data.WorkPointQ > ana_data.CurveInfoQP.Max)
+                    {
+                        ana_data.WorkPointP = Math.Round(IStation.Model.FitCurveHelper.GetFitPointY(ana_data.CurveInfoQP, ana_data.CurveInfoQP.Max ), 1);
+                    }
+                    else
+                    {
+                        return 0;
+                    }
+               
+                }
+                  
                 ana_data.WorkPointE = Math.Round(IStation.Common.PumpParaHelper.CalculateE(ana_data.WorkPointQ, ana_data.WorkPointH, ana_data.WorkPointP), 1);
 
                 ana_data.IsExtendCurve = false;

--
Gitblit v1.9.3