From 59e5e0bf989993c0dce1851e34bcbe4bfb42ed56 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 25 十月 2024 15:53:21 +0800
Subject: [PATCH] 增加空压机管理和换热器管理

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingForm.cs |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingForm.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingForm.cs
index 9d36bbf..377c718 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingForm.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingForm.cs
@@ -1,10 +1,10 @@
 锘縰sing HStation.WinFrmUI.PhartRelation;
 
-namespace HStation.WinFrmUI.Xhs
+namespace HStation.WinFrmUI
 {
-    public partial class PumpSingleMatchingForm : DevExpress.XtraEditors.XtraUserControl
+    public partial class PumpSingleMatchingCtrl : DevExpress.XtraEditors.XtraUserControl
     {
-        public PumpSingleMatchingForm()
+        public PumpSingleMatchingCtrl()
         {
             InitializeComponent();
             this.gridView1.SetNormalView();
@@ -28,7 +28,7 @@
 
         private List<PumpSingleMatchingViewModel> _allBindingList = null;
 
-        private BLL.PumpMain _pumpBll = null;
+        private BLL.AssetsPumpMain _pumpBll = null;
 
         private List<PhartViewModel> _allPhartList = null;
         private readonly Lazy<BLL.XhsPumpMainPhartMappingExtensions> _bll_ex = new();
@@ -39,12 +39,14 @@
         {
             _pumpMatchingViewModel = pumpMatchingViewModel;
             _allBindingList = new List<PumpSingleMatchingViewModel>();
-            _pumpBll = new BLL.PumpMain();
-            var allPumpMain = await _pumpBll.GetAll();
-            foreach (var Main in allPumpMain)
+            _pumpBll = new BLL.AssetsPumpMain();
+            var allAssetsPumpMain = await _pumpBll.GetAll();
+            foreach (var Main in allAssetsPumpMain)
             {
                 _allBindingList.Add(new PumpSingleMatchingViewModel(Main));
             }
+            this.gridControl2.DataSource = _allBindingList;
+            this.searchControl1.Text = pumpMatchingViewModel.ModelType;
             for (int i = 0; i < _allBindingList.Count; i++)
             {
                 if (long.TryParse(pumpMatchingViewModel.DbId, out long dbID))
@@ -55,8 +57,6 @@
                     }
                 }
             }
-            this.gridControl2.DataSource = _allBindingList;
-            this.searchControl1.Text = pumpMatchingViewModel.ModelType;
         }
 
         //鍒濆鍖栧浘琛ㄦ暟鎹�
@@ -110,6 +110,11 @@
             if (vm != null)
             {
                 _pumpMatchingViewModel.MatchingDbId = vm.ID.ToString();
+                _pumpMatchingViewModel.MatchingModelType = vm.Name.ToString();
+                _pumpMatchingViewModel.MatchingRatedH = vm.RatedHead;
+                _pumpMatchingViewModel.MatchingRatedN = vm.RatedSpeed;
+                _pumpMatchingViewModel.MatchingRatedP = vm.RatedPower;
+                _pumpMatchingViewModel.MatchingRatedQ = vm.RatedFlow;
                 var list = await _bll_ex.Value.GetByPumpMainID(vm.ID);
                 if (list != null && list.Any())
                 {

--
Gitblit v1.9.3