From e32f35f3850e3209f15d81b0b41117764febc6e2 Mon Sep 17 00:00:00 2001
From: tangxu <76880903@qq.com>
Date: 星期四, 03 十一月 2022 13:53:50 +0800
Subject: [PATCH] 计划返回值, 增加状态信息

---
 Calculation/IStation.Calculation.Dispatch/base/CalculatorOptAnaBase.cs |   29 ++++++++++++++++++++++++++++-
 1 files changed, 28 insertions(+), 1 deletions(-)

diff --git a/Calculation/IStation.Calculation.Dispatch/base/CalculatorOptAnaBase.cs b/Calculation/IStation.Calculation.Dispatch/base/CalculatorOptAnaBase.cs
index 88abe46..e9aa2ef 100644
--- a/Calculation/IStation.Calculation.Dispatch/base/CalculatorOptAnaBase.cs
+++ b/Calculation/IStation.Calculation.Dispatch/base/CalculatorOptAnaBase.cs
@@ -119,11 +119,38 @@
                 //姹囨��
                 sum.Qt = sum.Qt + opt_anaScheme.TotalWrkQ;
                 sum.Dt = sum.Dt + opt_anaScheme.TotalWrkP;
+
+                //
+                if(!string.IsNullOrEmpty(opt_anaScheme.ResultStatusInfo))
+                sum.Info = opt_anaScheme.ResultStatusInfo;
             }
             sum.WP = CalculateWP(sum.Dt, sum.Qt);
             return sum;
         }
- 
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="pipes"></param>
+        /// <returns></returns>
+        protected static double CalcConnectPipeEta(List<IStation.Calculation.DispatchAna.Model.AnaScheme> pipes)
+        {
+            double eta = 0;
+            double qh = 0;
+            int count = 0;
+            foreach (var pipe in pipes)
+            {
+                if (pipe == null)
+                    continue;
+                if (pipe.TotalWrkQ < 1 || pipe.TotalWrkH < 0.1)
+                    continue;
+                qh += pipe.TotalWrkQ * pipe.TotalWrkH;
+                eta += pipe.TotalWrkQ * pipe.TotalWrkH * pipe.TotalWrkE;
+                count++;
+            }
+            if (count <= 0)
+                return 0;
+            return Math.Round(eta / qh, 2);
+        }
     }
 }

--
Gitblit v1.9.3