HStation/XHS.V1.0.git

			@@ -12,9 +12,6 @@
			{
			InitializeComponent();

			this.hydroParterPropertyCtrl1.ViewCurveEvent += HydroParterPropertyCtrl1_ViewCurveEvent;
			this.hydroParterPropertyCtrl1.SetCurveEvent += HydroParterPropertyCtrl1_SetCurveEvent;
			this.hydroParterPropertyCtrl1.SetPatternEvent += HydroParterPropertyCtrl1_SetPatternEvent;
			this.hydroParterPropertyCtrl1.PropertyValueChangedEvent += HydroParterPropertyCtrl1_PropertyValueChangedEvent;
			this.hydroParterPropertyCtrl1.PropertyValueChangingEvent += HydroParterPropertyCtrl1_PropertyValueChangingEvent;
			this.hydroParterPropertyCtrl1.MatchingDbEvent += HydroParterPropertyCtrl1_MatchingDbEvent;
			@@ -30,13 +27,15 @@

			//水力信息方法
			private Func<Yw.Model.HydroModelInfo> _hydroInfoFunc = null;
			private Func<List<IHydroCalcuResult>> _allHydroCalcuResultListFunc = null;

			/// <summary>
			/// 初始化数据
			/// </summary>
			public void InitialData(Func<Yw.Model.HydroModelInfo> hydroInfoFunc)
			public void InitialData(Func<Yw.Model.HydroModelInfo> hydroInfoFunc, Func<List<IHydroCalcuResult>> allHydroCalcuResultListFunc)
			{
			_hydroInfoFunc = hydroInfoFunc;
			_allHydroCalcuResultListFunc = allHydroCalcuResultListFunc;
			this.hydroParterPropertyCtrl1.InitialData(hydroInfoFunc);
			}

			@@ -147,7 +146,7 @@
			}
			var pumpInfo = hydroInfo.Pumps?.Find(x => x.Code == propViewModel.Code);

			var input = AssetsMatchingParasHelper.Create(hydroInfo, pumpInfo);
			var input = AssetsMatchingParasHelper.Create(hydroInfo, pumpInfo, _allHydroCalcuResultListFunc?.Invoke());
			var dlg = new PumpSingleMatchingDlg();
			dlg.SetBindingData(input);
			dlg.ReloadDataEvent += (rhs) =>
			@@ -223,110 +222,109 @@
			}

			//匹配Db
			private void HydroParterPropertyCtrl1_MatchingDbEvent(Yw.Model.HydroParterInfo parter)
			private bool HydroParterPropertyCtrl1_MatchingDbEvent(HydroParterPropertyViewModel propertyViewModel)
			{
			if (parter == null)
			var bol = false;
			if (propertyViewModel == null)
			{
			return;
			return bol;
			}
			var hydroInfo = _hydroInfoFunc?.Invoke();
			if (hydroInfo == null)
			{
			return;
			return bol;
			}
			switch (parter.Catalog)
			var catalog = Yw.WinFrmUI.HydroParterCatalogHelper.GetCatalogCode(propertyViewModel.Catalog);
			switch (catalog)
			{
			case Yw.Hydro.ParterCatalog.Pump://水泵
			{
			var pumpInfo = hydroInfo.Pumps?.Find(x => x.Code == parter.Code);
			var input = AssetsMatchingParasHelper.Create(hydroInfo, pumpInfo);

			if (!string.IsNullOrEmpty(pumpInfo.DbId))
			var pumpInfo = hydroInfo.Pumps?.Find(x => x.Code == propertyViewModel.Code);
			if (pumpInfo == null)
			{
			var detailDlg = new PumpFullInfoViewDlg();
			detailDlg.SetBindindData(input);
			detailDlg.ShowDialog();
			break;
			}
			else

			var input = AssetsMatchingParasHelper.Create(hydroInfo, pumpInfo, _allHydroCalcuResultListFunc?.Invoke());
			if (string.IsNullOrEmpty(pumpInfo.DbId))
			{
			var dlg = new PumpSingleMatchingDlg();
			dlg.SetBindingData(input);
			dlg.ReloadDataEvent += (rhs) =>
			dlg.ReloadDataEvent += (output) =>
			{
			var bol = AssetsMatchingParasHelper.Apply(hydroInfo, rhs);
			bol = AssetsMatchingParasHelper.Apply(hydroInfo, output);
			if (bol)
			{
			TipFormHelper.ShowSucceed("匹配成功");
			propertyViewModel.UpdateProperty(pumpInfo, hydroInfo.GetAllParters());
			}
			else
			};
			dlg.ShowDialog();
			}
			else
			{
			var dlg = new PumpFullInfoViewDlg();
			dlg.SetBindindData(input);
			dlg.ReloadDataEvent += (output) =>
			{
			bol = AssetsMatchingParasHelper.Apply(hydroInfo, output);
			if (bol)
			{
			TipFormHelper.ShowWarn("匹配失败");
			propertyViewModel.UpdateProperty(pumpInfo, hydroInfo.GetAllParters());
			}
			};
			dlg.ShowDialog();
			}
			}
			break;

			case Yw.Hydro.ParterCatalog.Valve://阀门
			{
			var valveInfo = hydroInfo.Valves?.Find(x => x.Code == parter.Code);
			var input = AssetsMatchingParasHelper.Create(hydroInfo, valveInfo);
			var valveInfo = hydroInfo.Valves?.Find(x => x.Code == propertyViewModel.Code);
			if (valveInfo == null)
			{
			break;
			}
			var input = AssetsMatchingParasHelper.Create(hydroInfo, valveInfo, _allHydroCalcuResultListFunc?.Invoke());
			var dlg = new ValveSingleMatchingDlg();
			dlg.SetBindingData(input);
			dlg.ReloadDataEvent += (rhs) =>
			{
			var bol = AssetsMatchingParasHelper.Apply(hydroInfo, rhs);
			if (bol)
			{
			TipFormHelper.ShowSucceed("匹配成功");
			}
			else
			{
			TipFormHelper.ShowWarn("匹配失败");
			}
			bol = AssetsMatchingParasHelper.Apply(hydroInfo, rhs);
			};
			dlg.ShowDialog();
			}
			break;

			case Yw.Hydro.ParterCatalog.Pipe://管道
			{
			}
			break;

			case Yw.Hydro.ParterCatalog.Elbow://弯头
			{
			var elbowInfo = hydroInfo.Elbows?.Find(x => x.Code == parter.Code);
			var input = AssetsMatchingParasHelper.Create(hydroInfo, elbowInfo);
			var elbowInfo = hydroInfo.Elbows?.Find(x => x.Code == propertyViewModel.Code);
			if (elbowInfo == null)
			{
			break;
			}
			var input = AssetsMatchingParasHelper.Create(hydroInfo, elbowInfo, _allHydroCalcuResultListFunc?.Invoke());
			var dlg = new ElbowSingMatchingDlg();
			dlg.SetBindingData(input);
			dlg.ReloadDataEvent += (rhs) =>
			dlg.ReloadDataEvent += (output) =>
			{
			var bol = AssetsMatchingParasHelper.Apply(hydroInfo, rhs);
			if (bol)
			{
			TipFormHelper.ShowSucceed("匹配成功");
			}
			else
			{
			TipFormHelper.ShowWarn("匹配失败");
			}
			bol = AssetsMatchingParasHelper.Apply(hydroInfo, output);
			};
			dlg.ShowDialog();
			}
			break;

			case Yw.Hydro.ParterCatalog.Threelink://三通
			{
			}
			break;

			case Yw.Hydro.ParterCatalog.Fourlink://四通
			{
			}
			break;
			default: break;
			}
			return bol;
			}

			//强调连接组件