From c653f2f6f2de553395b706de3a62fec5e4a6fbf7 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 21 十一月 2024 17:52:18 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/01-result/HydroCalcuResultHelper.cs | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 54 insertions(+), 0 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/01-result/HydroCalcuResultHelper.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/01-result/HydroCalcuResultHelper.cs
index 8fd3d6c..27d7cfa 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/01-result/HydroCalcuResultHelper.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-calcu/01-result/HydroCalcuResultHelper.cs
@@ -143,10 +143,64 @@
}
hydroCalcuResult.LinkList.Remove(calcuPumpResult);
hydroCalcuResult.LinkList.Add(calcuPumpNewResult);
+
+ switch (pump.LinkStatus)
+ {
+ case Yw.Hydro.PumpStatus.Open:
+ {
+ if (calcuPumpNewResult.CalcuFlow.HasValue)
+ {
+ if (calcuPumpNewResult.CalcuFlow.Value <= 0)
+ {
+ hydroCalcuResult.WainingList.Add(new HydroCalcuWarning()
+ {
+ Code = pump.Code,
+ Message = $"[{pump.Name}]涓嶆弧瓒冲綋鍓嶅伐鍐� "
+ });
+ }
+ }
+ else
+ {
+ hydroCalcuResult.WainingList.Add(new HydroCalcuWarning()
+ {
+ Code = pump.Code,
+ Message = $"[{pump.Name}]娴侀噺璁＄畻澶辫触 "
+ });
+ }
+ }
+ break;
+ case Yw.Hydro.PumpStatus.Closed:
+ {
+ if (calcuPumpNewResult.CalcuFlow.HasValue)
+ {
+ if (calcuPumpNewResult.CalcuFlow.Value > 0)
+ {
+ hydroCalcuResult.WainingList.Add(new HydroCalcuWarning()
+ {
+ Code = pump.Code,
+ Message = $"[{pump.Name}]涓嶆弧瓒冲綋鍓嶅伐鍐� "
+ });
+ }
+ }
+ else
+ {
+ hydroCalcuResult.WainingList.Add(new HydroCalcuWarning()
+ {
+ Code = pump.Code,
+ Message = $"[{pump.Name}]娴侀噺璁＄畻澶辫触 "
+ });
+ }
+ }
+ break;
+ default: break;
+ }
+
}
}
}
+
+
return hydroCalcuResult;
}
--
Gitblit v1.9.3