From f2cc8078a00824a319dab44841f7cb64fdee76b0 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 11 十二月 2024 09:41:32 +0800
Subject: [PATCH] 引用修改

---
 WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/00-core/HydroMatchingHelper.cs | 2691 +++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 1,954 insertions(+), 737 deletions(-)

diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/00-core/HydroMatchingHelper.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/00-core/HydroMatchingHelper.cs
index 584d927..ce6cd35 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/00-core/HydroMatchingHelper.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/00-core/HydroMatchingHelper.cs
@@ -1,4 +1,9 @@
-锘縰sing Yw.Model;
+锘縰sing DevExpress.XtraSpreadsheet.Model.CopyOperation;
+using System.Windows.Media.Imaging;
+using Yw.DAL.Basic;
+using Yw.EPAnet;
+using Yw.Hydro;
+using Yw.Model;
 
 namespace Yw.WinFrmUI
 {
@@ -11,144 +16,115 @@
         #region 鍒涘缓
 
         /// <summary>
-        /// 鍒涘缓鑷姩鍖归厤ViewModel
+        /// 鍒涘缓
         /// </summary>
-        public static HydroMatchingViewModel Create(Yw.Model.HydroModelInfo hydroInfo, List<HydroCalcuVisualResult> allCalcuVisualResultList = null)
+        public static HydroMatchingViewModel Create(Yw.Model.HydroModelInfo hydroInfo)
         {
-            #region 鍒濆鍖栧瓧鍏�
-
-            Dictionary<string, HydroCalcuVisualResult> dict = null;
-            if (allCalcuVisualResultList != null && allCalcuVisualResultList.Count > 0)
+            if (hydroInfo == null)
             {
-                dict = new Dictionary<string, HydroCalcuVisualResult>();
-                allCalcuVisualResultList.ForEach(x => dict.Add(x.Code, x));
-            }
-
-            #endregion
-
-            #region 鑾峰彇璁$畻缁撴灉鏂规硶
-
-            HydroCalcuVisualResult getCalcuVisualResult(string code)
-            {
-                if (dict == null)
-                {
-                    return default;
-                }
-                if (dict.ContainsKey(code))
-                {
-                    return dict[code];
-                }
                 return default;
             }
-
-            #endregion
 
             var vm = new HydroMatchingViewModel();
 
             #region 姘存睜
 
             var tanks = hydroInfo.GetAllTanks();
-            vm.Tanks = tanks?.Select(x => Create(x, hydroInfo, getCalcuVisualResult(x.Code) as HydroCalcuNodeResult)).ToList();
+            vm.Tanks = tanks?.Select(x => Create(x, hydroInfo)).ToList();
 
             #endregion
 
             #region 闂峰ご
 
-            vm.Bluntheads = hydroInfo.Bluntheads?.Select(x => Create(x, hydroInfo, getCalcuVisualResult(x.Code) as HydroCalcuNodeResult)).ToList();
+            vm.Bluntheads = hydroInfo.Bluntheads?.Select(x => Create(x, hydroInfo)).ToList();
 
             #endregion
 
             #region 寮ご
 
-            vm.Elbows = hydroInfo.Elbows?.Select(x => Create(x, hydroInfo, getCalcuVisualResult(x.Code) as HydroCalcuNodeResult)).ToList();
+            vm.Elbows = hydroInfo.Elbows?.Select(x => Create(x, hydroInfo)).ToList();
 
             #endregion
 
             #region 涓夐��
 
-            vm.Threelinks = hydroInfo.Threelinks?.Select(x => Create(x, hydroInfo, getCalcuVisualResult(x.Code) as HydroCalcuNodeResult)).ToList();
+            vm.Threelinks = hydroInfo.Threelinks?.Select(x => Create(x, hydroInfo)).ToList();
 
             #endregion
 
             #region 鍥涢��
 
-            vm.Fourlinks = hydroInfo.Fourlinks?.Select(x => Create(x, hydroInfo, getCalcuVisualResult(x.Code) as HydroCalcuNodeResult)).ToList();
+            vm.Fourlinks = hydroInfo.Fourlinks?.Select(x => Create(x, hydroInfo)).ToList();
 
             #endregion
 
             #region 鍠峰槾
 
-            vm.Nozzles = hydroInfo.Nozzles?.Select(x => Create(x, hydroInfo, getCalcuVisualResult(x.Code) as HydroCalcuNodeResult)).ToList();
+            vm.Nozzles = hydroInfo.Nozzles?.Select(x => Create(x, hydroInfo)).ToList();
 
             #endregion
 
             #region 娑堢伀鏍�
 
-            vm.Hydrants = hydroInfo.Hydrants?.Select(x => Create(x, hydroInfo, getCalcuVisualResult(x.Code) as HydroCalcuNodeResult)).ToList();
+            vm.Hydrants = hydroInfo.Hydrants?.Select(x => Create(x, hydroInfo)).ToList();
 
             #endregion
 
             #region 姘磋〃
 
-            vm.Meters = hydroInfo.Meters?.Select(x => Create(x, hydroInfo, getCalcuVisualResult(x.Code) as HydroCalcuNodeResult)).ToList();
+            vm.Meters = hydroInfo.Meters?.Select(x => Create(x, hydroInfo)).ToList();
 
             #endregion
 
             #region 娴侀噺璁�
 
-            vm.Flowmeters = hydroInfo.Flowmeters?.Select(x => Create(x, hydroInfo, getCalcuVisualResult(x.Code) as HydroCalcuFlowmeterResult)).ToList();
+            vm.Flowmeters = hydroInfo.Flowmeters?.Select(x => Create(x, hydroInfo)).ToList();
 
             #endregion
 
             #region 鍘嬪姏琛�
 
-            vm.Pressmeters = hydroInfo.Pressmeters?.Select(x => Create(x, hydroInfo, getCalcuVisualResult(x.Code) as HydroCalcuPressmeterResult)).ToList();
+            vm.Pressmeters = hydroInfo.Pressmeters?.Select(x => Create(x, hydroInfo)).ToList();
 
             #endregion
 
             #region 绠¢亾
 
-            vm.Pipes = hydroInfo.Pipes?.Select(x => Create(x, hydroInfo, getCalcuVisualResult(x.Code) as HydroCalcuLinkResult)).ToList();
+            vm.Pipes = hydroInfo.Pipes?.Select(x => Create(x, hydroInfo)).ToList();
 
             #endregion
 
             #region 杩囨浮浠�
 
-            vm.Translations = hydroInfo.Translations?.Select(x => Create(x, hydroInfo, getCalcuVisualResult(x.Code) as HydroCalcuLinkResult)).ToList();
+            vm.Translations = hydroInfo.Translations?.Select(x => Create(x, hydroInfo)).ToList();
 
             #endregion
 
             #region 姘存车
 
-            vm.Pumps = hydroInfo.Pumps?.Select(x => Create(x, hydroInfo, getCalcuVisualResult(x.Code) as HydroCalcuPumpResult)).ToList();
+            vm.Pumps = hydroInfo.Pumps?.Select(x => Create(x, hydroInfo)).ToList();
 
             #endregion
 
             #region 闃�闂�
 
-            vm.Valves = hydroInfo.Valves?.Select(x => Create(x, hydroInfo, getCalcuVisualResult(x.Code) as HydroCalcuLinkResult)).ToList();
+            vm.Valves = hydroInfo.Valves?.Select(x => Create(x, hydroInfo)).ToList();
 
             #endregion
 
             #region 鎹㈢儹鍣�
 
-            vm.Exchangers = hydroInfo.Exchangers?.Select(x => Create(x, hydroInfo, getCalcuVisualResult(x.Code) as HydroCalcuLinkResult)).ToList();
+            vm.Exchangers = hydroInfo.Exchangers?.Select(x => Create(x, hydroInfo)).ToList();
 
             #endregion
 
             #region 鍘嬬缉鏈�
 
-            vm.Compressors = hydroInfo.Compressors?.Select(x => Create(x, hydroInfo, getCalcuVisualResult(x.Code) as HydroCalcuLinkResult)).ToList();
+            vm.Compressors = hydroInfo.Compressors?.Select(x => Create(x, hydroInfo)).ToList();
 
             #endregion
 
             return vm;
-
-        }
-
-        public static HydroMatchingViewModel Create(List<HydroVisualViewModel> allVisualList)
-        {
-            return default;
         }
 
         #region 姘存睜
@@ -156,9 +132,9 @@
         /// <summary>
         /// 鍒涘缓姘存睜鑷姩鍖归厤ViewModel
         /// </summary>
-        public static HydroTankMatchingViewModel Create(HydroTankInfo parterInfo, HydroModelInfo hydroInfo, HydroCalcuNodeResult calcuResult = null)
+        public static HydroTankMatchingViewModel Create(HydroTankInfo visualInfo, HydroModelInfo hydroInfo)
         {
-            if (parterInfo == null)
+            if (visualInfo == null)
             {
                 return default;
             }
@@ -166,19 +142,19 @@
             {
                 return default;
             }
-            return new HydroTankMatchingViewModel(parterInfo, hydroInfo, calcuResult);
+            return new HydroTankMatchingViewModel(visualInfo, hydroInfo);
         }
 
         /// <summary>
         /// 鍒涘缓姘存睜鑷姩鍖归厤ViewModel
         /// </summary>
-        public static HydroTankMatchingViewModel Create(HydroTankViewModel parterViewModel)
+        public static HydroTankMatchingViewModel Create(HydroTankViewModel visualViewModel)
         {
-            if (parterViewModel == null)
+            if (visualViewModel == null)
             {
                 return default;
             }
-            return new HydroTankMatchingViewModel(parterViewModel);
+            return new HydroTankMatchingViewModel(visualViewModel);
         }
 
         #endregion
@@ -188,9 +164,9 @@
         /// <summary>
         /// 鍒涘缓闂峰ご鑷姩鍖归厤ViewModel
         /// </summary>
-        public static HydroBluntheadMatchingViewModel Create(HydroBluntheadInfo parterInfo, HydroModelInfo hydroInfo, HydroCalcuNodeResult calcuResult = null)
+        public static HydroBluntheadMatchingViewModel Create(HydroBluntheadInfo visualInfo, HydroModelInfo hydroInfo)
         {
-            if (parterInfo == null)
+            if (visualInfo == null)
             {
                 return default;
             }
@@ -198,19 +174,19 @@
             {
                 return default;
             }
-            return new HydroBluntheadMatchingViewModel(parterInfo, hydroInfo, calcuResult);
+            return new HydroBluntheadMatchingViewModel(visualInfo, hydroInfo);
         }
 
         /// <summary>
         /// 鍒涘缓闂峰ご鑷姩鍖归厤ViewModel
         /// </summary>
-        public static HydroBluntheadMatchingViewModel Create(HydroBluntheadViewModel parterViewModel)
+        public static HydroBluntheadMatchingViewModel Create(HydroBluntheadViewModel visualViewModel)
         {
-            if (parterViewModel == null)
+            if (visualViewModel == null)
             {
                 return default;
             }
-            return new HydroBluntheadMatchingViewModel(parterViewModel);
+            return new HydroBluntheadMatchingViewModel(visualViewModel);
         }
 
         #endregion
@@ -220,9 +196,9 @@
         /// <summary>
         /// 鍒涘缓寮ご鑷姩鍖归厤ViewModel
         /// </summary>
-        public static HydroElbowMatchingViewModel Create(HydroElbowInfo parterInfo, HydroModelInfo hydroInfo, HydroCalcuNodeResult calcuResult = null)
+        public static HydroElbowMatchingViewModel Create(HydroElbowInfo visualInfo, HydroModelInfo hydroInfo)
         {
-            if (parterInfo == null)
+            if (visualInfo == null)
             {
                 return default;
             }
@@ -230,19 +206,19 @@
             {
                 return default;
             }
-            return new HydroElbowMatchingViewModel(parterInfo, hydroInfo, calcuResult);
+            return new HydroElbowMatchingViewModel(visualInfo, hydroInfo);
         }
 
         /// <summary>
         /// 鍒涘缓寮ご鑷姩鍖归厤ViewModel
         /// </summary>
-        public static HydroElbowMatchingViewModel Create(HydroElbowViewModel parterViewModel)
+        public static HydroElbowMatchingViewModel Create(HydroElbowViewModel visualViewModel)
         {
-            if (parterViewModel == null)
+            if (visualViewModel == null)
             {
                 return default;
             }
-            return new HydroElbowMatchingViewModel(parterViewModel);
+            return new HydroElbowMatchingViewModel(visualViewModel);
         }
 
         #endregion
@@ -252,9 +228,9 @@
         /// <summary>
         /// 鍒涘缓涓夐�氳嚜鍔ㄥ尮閰峍iewModel
         /// </summary>
-        public static HydroThreelinkMatchingViewModel Create(HydroThreelinkInfo parterInfo, HydroModelInfo hydroInfo, HydroCalcuNodeResult calcuResult = null)
+        public static HydroThreelinkMatchingViewModel Create(HydroThreelinkInfo visualInfo, HydroModelInfo hydroInfo)
         {
-            if (parterInfo == null)
+            if (visualInfo == null)
             {
                 return default;
             }
@@ -262,19 +238,19 @@
             {
                 return default;
             }
-            return new HydroThreelinkMatchingViewModel(parterInfo, hydroInfo, calcuResult);
+            return new HydroThreelinkMatchingViewModel(visualInfo, hydroInfo);
         }
 
         /// <summary>
         /// 鍒涘缓涓夐�氳嚜鍔ㄥ尮閰峍iewModel
         /// </summary>
-        public static HydroThreelinkMatchingViewModel Create(HydroThreelinkViewModel parterViewModel)
+        public static HydroThreelinkMatchingViewModel Create(HydroThreelinkViewModel visualViewModel)
         {
-            if (parterViewModel == null)
+            if (visualViewModel == null)
             {
                 return default;
             }
-            return new HydroThreelinkMatchingViewModel(parterViewModel);
+            return new HydroThreelinkMatchingViewModel(visualViewModel);
         }
 
         #endregion
@@ -284,9 +260,9 @@
         /// <summary>
         /// 鍒涘缓鍥涢�氳嚜鍔ㄥ尮閰峍iewModel
         /// </summary>
-        public static HydroFourlinkMatchingViewModel Create(HydroFourlinkInfo parterInfo, HydroModelInfo hydroInfo, HydroCalcuNodeResult calcuResult = null)
+        public static HydroFourlinkMatchingViewModel Create(HydroFourlinkInfo visualInfo, HydroModelInfo hydroInfo)
         {
-            if (parterInfo == null)
+            if (visualInfo == null)
             {
                 return default;
             }
@@ -294,19 +270,19 @@
             {
                 return default;
             }
-            return new HydroFourlinkMatchingViewModel(parterInfo, hydroInfo, calcuResult);
+            return new HydroFourlinkMatchingViewModel(visualInfo, hydroInfo);
         }
 
         /// <summary>
         /// 鍒涘缓鍥涢�氳嚜鍔ㄥ尮閰峍iewModel
         /// </summary>
-        public static HydroFourlinkMatchingViewModel Create(HydroFourlinkViewModel parterViewModel)
+        public static HydroFourlinkMatchingViewModel Create(HydroFourlinkViewModel visualViewModel)
         {
-            if (parterViewModel == null)
+            if (visualViewModel == null)
             {
                 return default;
             }
-            return new HydroFourlinkMatchingViewModel(parterViewModel);
+            return new HydroFourlinkMatchingViewModel(visualViewModel);
         }
 
         #endregion
@@ -316,9 +292,9 @@
         /// <summary>
         /// 鍒涘缓鍠峰ご鑷姩鍖归厤ViewModel
         /// </summary>
-        public static HydroNozzleMatchingViewModel Create(HydroNozzleInfo parterInfo, HydroModelInfo hydroInfo, HydroCalcuNodeResult calcuResult = null)
+        public static HydroNozzleMatchingViewModel Create(HydroNozzleInfo visualInfo, HydroModelInfo hydroInfo)
         {
-            if (parterInfo == null)
+            if (visualInfo == null)
             {
                 return default;
             }
@@ -326,19 +302,19 @@
             {
                 return default;
             }
-            return new HydroNozzleMatchingViewModel(parterInfo, hydroInfo, calcuResult);
+            return new HydroNozzleMatchingViewModel(visualInfo, hydroInfo);
         }
 
         /// <summary>
         /// 鍒涘缓鍠峰ご鑷姩鍖归厤ViewModel
         /// </summary>
-        public static HydroNozzleMatchingViewModel Create(HydroNozzleViewModel parterViewModel)
+        public static HydroNozzleMatchingViewModel Create(HydroNozzleViewModel visualViewModel)
         {
-            if (parterViewModel == null)
+            if (visualViewModel == null)
             {
                 return default;
             }
-            return new HydroNozzleMatchingViewModel(parterViewModel);
+            return new HydroNozzleMatchingViewModel(visualViewModel);
         }
 
         #endregion
@@ -348,9 +324,9 @@
         /// <summary>
         /// 鍒涘缓娑堢伀鏍撹嚜鍔ㄥ尮閰峍iewModel
         /// </summary>
-        public static HydroHydrantMatchingViewModel Create(HydroHydrantInfo parterInfo, HydroModelInfo hydroInfo, HydroCalcuNodeResult calcuResult = null)
+        public static HydroHydrantMatchingViewModel Create(HydroHydrantInfo visualInfo, HydroModelInfo hydroInfo)
         {
-            if (parterInfo == null)
+            if (visualInfo == null)
             {
                 return default;
             }
@@ -358,19 +334,19 @@
             {
                 return default;
             }
-            return new HydroHydrantMatchingViewModel(parterInfo, hydroInfo, calcuResult);
+            return new HydroHydrantMatchingViewModel(visualInfo, hydroInfo);
         }
 
         /// <summary>
         /// 鍒涘缓娑堢伀鏍撹嚜鍔ㄥ尮閰峍iewModel
         /// </summary>
-        public static HydroHydrantMatchingViewModel Create(HydroHydrantViewModel parterViewModel)
+        public static HydroHydrantMatchingViewModel Create(HydroHydrantViewModel visualViewModel)
         {
-            if (parterViewModel == null)
+            if (visualViewModel == null)
             {
                 return default;
             }
-            return new HydroHydrantMatchingViewModel(parterViewModel);
+            return new HydroHydrantMatchingViewModel(visualViewModel);
         }
 
         #endregion
@@ -380,9 +356,9 @@
         /// <summary>
         /// 鍒涘缓姘磋〃鑷姩鍖归厤ViewModel
         /// </summary>
-        public static HydroMeterMatchingViewModel Create(HydroMeterInfo parterInfo, HydroModelInfo hydroInfo, HydroCalcuNodeResult calcuResult = null)
+        public static HydroMeterMatchingViewModel Create(HydroMeterInfo visualInfo, HydroModelInfo hydroInfo)
         {
-            if (parterInfo == null)
+            if (visualInfo == null)
             {
                 return default;
             }
@@ -390,19 +366,19 @@
             {
                 return default;
             }
-            return new HydroMeterMatchingViewModel(parterInfo, hydroInfo, calcuResult);
+            return new HydroMeterMatchingViewModel(visualInfo, hydroInfo);
         }
 
         /// <summary>
         /// 鍒涘缓姘磋〃鑷姩鍖归厤ViewModel
         /// </summary>
-        public static HydroMeterMatchingViewModel Create(HydroMeterViewModel parterViewModel)
+        public static HydroMeterMatchingViewModel Create(HydroMeterViewModel visualViewModel)
         {
-            if (parterViewModel == null)
+            if (visualViewModel == null)
             {
                 return default;
             }
-            return new HydroMeterMatchingViewModel(parterViewModel);
+            return new HydroMeterMatchingViewModel(visualViewModel);
         }
 
         #endregion
@@ -412,9 +388,9 @@
         /// <summary>
         /// 鍒涘缓娴侀噺璁¤嚜鍔ㄥ尮閰峍iewModel
         /// </summary>
-        public static HydroFlowmeterMatchingViewModel Create(HydroFlowmeterInfo parterInfo, HydroModelInfo hydroInfo, HydroCalcuFlowmeterResult calcuResult = null)
+        public static HydroFlowmeterMatchingViewModel Create(HydroFlowmeterInfo visualInfo, HydroModelInfo hydroInfo)
         {
-            if (parterInfo == null)
+            if (visualInfo == null)
             {
                 return default;
             }
@@ -422,19 +398,19 @@
             {
                 return default;
             }
-            return new HydroFlowmeterMatchingViewModel(parterInfo, hydroInfo, calcuResult);
+            return new HydroFlowmeterMatchingViewModel(visualInfo, hydroInfo);
         }
 
         /// <summary>
         /// 鍒涘缓娴侀噺璁¤嚜鍔ㄥ尮閰峍iewModel
         /// </summary>
-        public static HydroFlowmeterMatchingViewModel Create(HydroFlowmeterViewModel parterViewModel)
+        public static HydroFlowmeterMatchingViewModel Create(HydroFlowmeterViewModel visualViewModel)
         {
-            if (parterViewModel == null)
+            if (visualViewModel == null)
             {
                 return default;
             }
-            return new HydroFlowmeterMatchingViewModel(parterViewModel);
+            return new HydroFlowmeterMatchingViewModel(visualViewModel);
         }
 
         #endregion
@@ -444,9 +420,9 @@
         /// <summary>
         /// 鍒涘缓鍘嬪姏琛ㄨ嚜鍔ㄥ尮閰峍iewModel
         /// </summary>
-        public static HydroPressmeterMatchingViewModel Create(HydroPressmeterInfo parterInfo, HydroModelInfo hydroInfo, HydroCalcuPressmeterResult calcuResult = null)
+        public static HydroPressmeterMatchingViewModel Create(HydroPressmeterInfo visualInfo, HydroModelInfo hydroInfo)
         {
-            if (parterInfo == null)
+            if (visualInfo == null)
             {
                 return default;
             }
@@ -454,19 +430,19 @@
             {
                 return default;
             }
-            return new HydroPressmeterMatchingViewModel(parterInfo, hydroInfo, calcuResult);
+            return new HydroPressmeterMatchingViewModel(visualInfo, hydroInfo);
         }
 
         /// <summary>
         /// 鍒涘缓鍘嬪姏琛ㄨ嚜鍔ㄥ尮閰峍iewModel
         /// </summary>
-        public static HydroPressmeterMatchingViewModel Create(HydroPressmeterViewModel parterViewModel)
+        public static HydroPressmeterMatchingViewModel Create(HydroPressmeterViewModel visualViewModel)
         {
-            if (parterViewModel == null)
+            if (visualViewModel == null)
             {
                 return default;
             }
-            return new HydroPressmeterMatchingViewModel(parterViewModel);
+            return new HydroPressmeterMatchingViewModel(visualViewModel);
         }
 
         #endregion
@@ -476,9 +452,9 @@
         /// <summary>
         /// 鍒涘缓绠¢亾鑷姩鍖归厤ViewModel
         /// </summary>
-        public static HydroPipeMatchingViewModel Create(HydroPipeInfo pipeInfo, HydroModelInfo hydroInfo, HydroCalcuLinkResult calcuResult = null)
+        public static HydroPipeMatchingViewModel Create(HydroPipeInfo visualInfo, HydroModelInfo hydroInfo)
         {
-            if (pipeInfo == null)
+            if (visualInfo == null)
             {
                 return default;
             }
@@ -486,19 +462,19 @@
             {
                 return default;
             }
-            return new HydroPipeMatchingViewModel(pipeInfo, hydroInfo, calcuResult);
+            return new HydroPipeMatchingViewModel(visualInfo, hydroInfo);
         }
 
         /// <summary>
         /// 鍒涘缓绠¢亾鑷姩鍖归厤ViewModel
         /// </summary>
-        public static HydroPipeMatchingViewModel Create(HydroPipeViewModel pipeViewModel)
+        public static HydroPipeMatchingViewModel Create(HydroPipeViewModel visualViewModel)
         {
-            if (pipeViewModel == null)
+            if (visualViewModel == null)
             {
                 return default;
             }
-            return new HydroPipeMatchingViewModel(pipeViewModel);
+            return new HydroPipeMatchingViewModel(visualViewModel);
         }
 
         #endregion
@@ -508,9 +484,9 @@
         /// <summary>
         /// 鍒涘缓杩囨浮浠惰嚜鍔ㄥ尮閰峍iewModel
         /// </summary>
-        public static HydroTranslationMatchingViewModel Create(HydroTranslationInfo parterInfo, HydroModelInfo hydroInfo, HydroCalcuLinkResult calcuResult = null)
+        public static HydroTranslationMatchingViewModel Create(HydroTranslationInfo visualInfo, HydroModelInfo hydroInfo)
         {
-            if (parterInfo == null)
+            if (visualInfo == null)
             {
                 return default;
             }
@@ -518,19 +494,19 @@
             {
                 return default;
             }
-            return new HydroTranslationMatchingViewModel(parterInfo, hydroInfo, calcuResult);
+            return new HydroTranslationMatchingViewModel(visualInfo, hydroInfo);
         }
 
         /// <summary>
         /// 鍒涘缓杩囨浮浠惰嚜鍔ㄥ尮閰峍iewModel
         /// </summary>
-        public static HydroTranslationMatchingViewModel Create(HydroTranslationViewModel parterViewModel)
+        public static HydroTranslationMatchingViewModel Create(HydroTranslationViewModel visualViewModel)
         {
-            if (parterViewModel == null)
+            if (visualViewModel == null)
             {
                 return default;
             }
-            return new HydroTranslationMatchingViewModel(parterViewModel);
+            return new HydroTranslationMatchingViewModel(visualViewModel);
         }
 
         #endregion
@@ -540,9 +516,9 @@
         /// <summary>
         /// 鍒涘缓姘存车鑷姩鍖归厤ViewModel
         /// </summary>
-        public static HydroPumpMatchingViewModel Create(HydroPumpInfo pumpInfo, HydroModelInfo hydroInfo, HydroCalcuPumpResult calcuResult = null)
+        public static HydroPumpMatchingViewModel Create(HydroPumpInfo visualInfo, HydroModelInfo hydroInfo)
         {
-            if (pumpInfo == null)
+            if (visualInfo == null)
             {
                 return default;
             }
@@ -550,19 +526,19 @@
             {
                 return default;
             }
-            return new HydroPumpMatchingViewModel(pumpInfo, hydroInfo, calcuResult);
+            return new HydroPumpMatchingViewModel(visualInfo, hydroInfo);
         }
 
         /// <summary>
         /// 鍒涘缓姘存车鑷姩鍖归厤ViewModel
         /// </summary>
-        public static HydroPumpMatchingViewModel Create(HydroPumpViewModel pumpViewModel)
+        public static HydroPumpMatchingViewModel Create(HydroPumpViewModel visualViewModel)
         {
-            if (pumpViewModel == null)
+            if (visualViewModel == null)
             {
                 return default;
             }
-            return new HydroPumpMatchingViewModel(pumpViewModel);
+            return new HydroPumpMatchingViewModel(visualViewModel);
         }
 
         #endregion
@@ -572,9 +548,9 @@
         /// <summary>
         /// 鍒涘缓闃�闂ㄨ嚜鍔ㄥ尮閰峍iewModel
         /// </summary>
-        public static HydroValveMatchingViewModel Create(HydroValveInfo valveInfo, HydroModelInfo hydroInfo, HydroCalcuLinkResult calcuResult = null)
+        public static HydroValveMatchingViewModel Create(HydroValveInfo visualInfo, HydroModelInfo hydroInfo)
         {
-            if (valveInfo == null)
+            if (visualInfo == null)
             {
                 return default;
             }
@@ -582,19 +558,19 @@
             {
                 return default;
             }
-            return new HydroValveMatchingViewModel(valveInfo, hydroInfo, calcuResult);
+            return new HydroValveMatchingViewModel(visualInfo, hydroInfo);
         }
 
         /// <summary>
         /// 鍒涘缓闃�闂ㄨ嚜鍔ㄥ尮閰峍iewModel
         /// </summary>
-        public static HydroValveMatchingViewModel Create(HydroValveViewModel valveViewModel)
+        public static HydroValveMatchingViewModel Create(HydroValveViewModel visualViewModel)
         {
-            if (valveViewModel == null)
+            if (visualViewModel == null)
             {
                 return default;
             }
-            return new HydroValveMatchingViewModel(valveViewModel);
+            return new HydroValveMatchingViewModel(visualViewModel);
         }
 
         #endregion
@@ -604,9 +580,9 @@
         /// <summary>
         /// 鍒涘缓鎹㈢儹鍣ㄨ嚜鍔ㄥ尮閰峍iewModel
         /// </summary>
-        public static HydroExchangerMatchingViewModel Create(HydroExchangerInfo parterInfo, HydroModelInfo hydroInfo, HydroCalcuLinkResult calcuResult = null)
+        public static HydroExchangerMatchingViewModel Create(HydroExchangerInfo visualInfo, HydroModelInfo hydroInfo)
         {
-            if (parterInfo == null)
+            if (visualInfo == null)
             {
                 return default;
             }
@@ -614,19 +590,19 @@
             {
                 return default;
             }
-            return new HydroExchangerMatchingViewModel(parterInfo, hydroInfo, calcuResult);
+            return new HydroExchangerMatchingViewModel(visualInfo, hydroInfo);
         }
 
         /// <summary>
         /// 鍒涘缓鎹㈢儹鍣ㄨ嚜鍔ㄥ尮閰峍iewModel
         /// </summary>
-        public static HydroExchangerMatchingViewModel Create(HydroExchangerViewModel parterViewModel)
+        public static HydroExchangerMatchingViewModel Create(HydroExchangerViewModel visualViewModel)
         {
-            if (parterViewModel == null)
+            if (visualViewModel == null)
             {
                 return default;
             }
-            return new HydroExchangerMatchingViewModel(parterViewModel);
+            return new HydroExchangerMatchingViewModel(visualViewModel);
         }
 
         #endregion
@@ -636,9 +612,9 @@
         /// <summary>
         /// 鍒涘缓鍘嬬缉鏈鸿嚜鍔ㄥ尮閰峍iewModel
         /// </summary>
-        public static HydroCompressorMatchingViewModel Create(HydroCompressorInfo parterInfo, HydroModelInfo hydroInfo, HydroCalcuLinkResult calcuResult = null)
+        public static HydroCompressorMatchingViewModel Create(HydroCompressorInfo visualInfo, HydroModelInfo hydroInfo)
         {
-            if (parterInfo == null)
+            if (visualInfo == null)
             {
                 return default;
             }
@@ -646,19 +622,19 @@
             {
                 return default;
             }
-            return new HydroCompressorMatchingViewModel(parterInfo, hydroInfo, calcuResult);
+            return new HydroCompressorMatchingViewModel(visualInfo, hydroInfo);
         }
 
         /// <summary>
         /// 鍒涘缓鍘嬬缉鏈鸿嚜鍔ㄥ尮閰峍iewModel
         /// </summary>
-        public static HydroCompressorMatchingViewModel Create(HydroCompressorViewModel parterViewModel)
+        public static HydroCompressorMatchingViewModel Create(HydroCompressorViewModel visualViewModel)
         {
-            if (parterViewModel == null)
+            if (visualViewModel == null)
             {
                 return default;
             }
-            return new HydroCompressorMatchingViewModel(parterViewModel);
+            return new HydroCompressorMatchingViewModel(visualViewModel);
         }
 
         #endregion
@@ -667,642 +643,1883 @@
 
         #region 搴旂敤
 
-        ///// <summary>
-        ///// 搴旂敤璧勪骇鑷姩鍖归厤ViewModel
-        ///// </summary>
-        //public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, AssetsMatchingViewModel output)
-        //{
-        //    if (hydroInfo == null)
-        //    {
-        //        return false;
-        //    }
-        //    if (output == null)
-        //    {
-        //        return false;
-        //    }
+        /// <summary>
+        /// 搴旂敤鑷姩鍖归厤ViewModel
+        /// </summary>
+        public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, HydroMatchingViewModel matchingInfo)
+        {
+            if (hydroInfo == null)
+            {
+                return false;
+            }
+            if (matchingInfo == null)
+            {
+                return false;
+            }
 
-        //    bool result = false;
+            bool result = false;
 
-        //    //姘存车
-        //    output.PumpMatchingList?.ForEach(x =>
-        //    {
-        //        if (Apply(hydroInfo, x))
-        //        {
-        //            result = true;
-        //        }
-        //    });
+            #region 姘存睜
 
-        //    //闃�闂�
-        //    output.ValveMatchingList?.ForEach(x =>
-        //    {
-        //        if (Apply(hydroInfo, x))
-        //        {
-        //            result = true;
-        //        }
-        //    });
+            var allTanks = hydroInfo.GetAllTanks();
+            if (allTanks != null && allTanks.Count > 0)
+            {
+                if (matchingInfo.Tanks != null && matchingInfo.Tanks.Count > 0)
+                {
+                    allTanks.ForEach(x =>
+                    {
+                        var matching = matchingInfo.Tanks.Find(t => t.Code == x.Code);
+                        if (Apply(hydroInfo, x, matching))
+                        {
+                            result = true;
+                        }
+                    });
+                }
 
-        //    //绠¢亾
-        //    output.PipeMatchingList?.ForEach(x =>
-        //    {
-        //        if (Apply(hydroInfo, x))
-        //        {
-        //            result = true;
-        //        }
-        //    });
+            }
 
-        //    //寮ご
-        //    output.ElbowMatchingList?.ForEach(x =>
-        //    {
-        //        if (Apply(hydroInfo, x))
-        //        {
-        //            result = true;
-        //        }
-        //    });
+            #endregion
 
-        //    //涓夐��
-        //    output.ThreelinkMatchingList?.ForEach(x =>
-        //    {
-        //        if (Apply(hydroInfo, x))
-        //        {
-        //            result = true;
-        //        }
-        //    });
+            #region 闂峰ご
 
-        //    //鍥涢��
-        //    output.FourlinkMatchingList?.ForEach(x =>
-        //    {
-        //        if (Apply(hydroInfo, x))
-        //        {
-        //            result = true;
-        //        }
-        //    });
+            if (hydroInfo.Bluntheads != null && hydroInfo.Bluntheads.Count > 0)
+            {
+                if (matchingInfo.Bluntheads != null && matchingInfo.Bluntheads.Count > 0)
+                {
+                    hydroInfo.Bluntheads.ForEach(x =>
+                    {
+                        var matching = matchingInfo.Bluntheads.Find(t => t.Code == x.Code);
+                        if (Apply(hydroInfo, x, matching))
+                        {
+                            result = true;
+                        }
+                    });
+                }
+            }
 
-        //    return result;
-        //}
+            #endregion
 
-        ///// <summary>
-        ///// 搴旂敤娉佃嚜鍔ㄥ尮閰峍iewModel
-        ///// </summary>
-        //public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, PumpMatchingViewModel matching)
-        //{
-        //    if (hydroInfo == null)
-        //    {
-        //        return false;
-        //    }
-        //    if (matching == null)
-        //    {
-        //        return false;
-        //    }
+            #region 寮ご
 
-        //    bool result = false;
+            if (hydroInfo.Elbows != null && hydroInfo.Elbows.Count > 0)
+            {
+                if (matchingInfo.Elbows != null && matchingInfo.Elbows.Count > 0)
+                {
+                    hydroInfo.Elbows.ForEach(x =>
+                    {
+                        var matching = matchingInfo.Elbows.Find(t => t.Code == x.Code);
+                        if (Apply(hydroInfo, x, matching))
+                        {
+                            result = true;
+                        }
+                    });
+                }
+            }
 
-        //    var pump = hydroInfo.Pumps?.Find(x => x.Code == matching.Code);
-        //    if (pump != null)
-        //    {
-        //        pump.DbLocked = matching.DbLocked;
-        //        pump.ModelType = matching.ModelType;
-        //        pump.RatedP = matching.RatedP;
-        //        pump.RatedQ = matching.RatedQ;
-        //        pump.RatedH = matching.RatedH;
-        //        pump.RatedN = matching.RatedN;
-        //        pump.RatedHz = matching.RatedHz;
-        //        pump.SpeedRatio = Math.Round(matching.CurrentHz / matching.RatedHz, 1);
+            #endregion
 
-        //        if (!pump.DbLocked)
-        //        {
-        //            if (!string.IsNullOrEmpty(matching.MatchingModelType))
-        //            {
-        //                pump.ModelType = matching.MatchingModelType;
-        //            }
-        //            if (!string.IsNullOrEmpty(matching.MatchingDbId))
-        //            {
-        //                pump.DbId = matching.MatchingDbId;
-        //            }
-        //            if (matching.MatchingRatedP.HasValue)
-        //            {
-        //                pump.RatedP = matching.MatchingRatedP.Value;
-        //            }
-        //            if (matching.MatchingRatedQ.HasValue)
-        //            {
-        //                pump.RatedQ = matching.MatchingRatedQ.Value;
-        //            }
-        //            if (matching.MatchingRatedH.HasValue)
-        //            {
-        //                pump.RatedH = matching.MatchingRatedH.Value;
-        //            }
-        //            if (matching.MatchingRatedN.HasValue)
-        //            {
-        //                pump.RatedN = matching.MatchingRatedN.Value;
-        //            }
+            #region 涓夐��
 
-        //            if (!string.IsNullOrEmpty(matching.MatchingCurveDbId))
-        //            {
-        //                //娴侀噺鎵▼鏇茬嚎
-        //                var curveqh = hydroInfo.Curves?.Find(x => x.Code == pump.CurveQH);
-        //                if (curveqh == null)
-        //                {
-        //                    curveqh = new Yw.Model.HydroCurveInfo();
-        //                    curveqh.Catalog = Yw.Hydro.ParterCatalog.Curve;
-        //                    curveqh.Code = Yw.Untity.UniqueHelper.CreateFromFirst("curve", hydroInfo.GetAllParterCodes());
-        //                    curveqh.Name = "鍖归厤";
-        //                    curveqh.ModelType = string.Empty;
-        //                    curveqh.DbLocked = false;
-        //                    curveqh.DbId = matching.MatchingCurveDbId;
-        //                    curveqh.CurveType = Yw.WinFrmUI.HydroCurve.PumpQH;
-        //                    curveqh.CurveData = matching.MatchingCurveQH?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
-        //                    if (hydroInfo.Curves == null)
-        //                    {
-        //                        hydroInfo.Curves = new List<Yw.Model.HydroCurveInfo>();
-        //                    }
-        //                    hydroInfo.Curves.Add(curveqh);
-        //                    pump.CurveQH = curveqh.Code;
-        //                }
-        //                else
-        //                {
-        //                    if (!curveqh.DbLocked)
-        //                    {
-        //                        curveqh.DbId = matching.MatchingCurveDbId;
-        //                        curveqh.CurveData = matching.MatchingCurveQH?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
-        //                    }
-        //                }
+            if (hydroInfo.Threelinks != null && hydroInfo.Threelinks.Count > 0)
+            {
+                if (matchingInfo.Threelinks != null && matchingInfo.Threelinks.Count > 0)
+                {
+                    hydroInfo.Threelinks.ForEach(x =>
+                    {
+                        var matching = matchingInfo.Threelinks.Find(t => t.Code == x.Code);
+                        if (Apply(hydroInfo, x, matching))
+                        {
+                            result = true;
+                        }
+                    });
+                }
+            }
 
-        //                //娴侀噺鍔熺巼鏇茬嚎
-        //                var curveqp = hydroInfo.Curves?.Find(x => x.Code == pump.CurveQP);
-        //                if (curveqp == null)
-        //                {
-        //                    curveqp = new Yw.Model.HydroCurveInfo();
-        //                    curveqp.Catalog = Yw.Hydro.ParterCatalog.Curve;
-        //                    curveqp.Code = Yw.Untity.UniqueHelper.CreateFromFirst("curve", hydroInfo.GetAllParterCodes());
-        //                    curveqp.Name = "鍖归厤";
-        //                    curveqp.ModelType = string.Empty;
-        //                    curveqp.DbLocked = false;
-        //                    curveqp.DbId = matching.MatchingCurveDbId;
-        //                    curveqp.CurveType = Yw.WinFrmUI.HydroCurve.PumpQP;
-        //                    curveqp.CurveData = matching.MatchingCurveQP?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
-        //                    if (hydroInfo.Curves == null)
-        //                    {
-        //                        hydroInfo.Curves = new List<Yw.Model.HydroCurveInfo>();
-        //                    }
-        //                    hydroInfo.Curves.Add(curveqp);
-        //                    pump.CurveQP = curveqp.Code;
-        //                }
-        //                else
-        //                {
-        //                    if (!curveqp.DbLocked)
-        //                    {
-        //                        curveqp.DbId = matching.MatchingCurveDbId;
-        //                        curveqp.CurveData = matching.MatchingCurveQP?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
-        //                    }
-        //                }
+            #endregion
 
-        //                //娴侀噺鏁堢巼鏇茬嚎
-        //                var curveqe = hydroInfo.Curves?.Find(x => x.Code == pump.CurveQE);
-        //                if (curveqe == null)
-        //                {
-        //                    curveqe = new Yw.Model.HydroCurveInfo();
-        //                    curveqe.Catalog = Yw.Hydro.ParterCatalog.Curve;
-        //                    curveqe.Code = Yw.Untity.UniqueHelper.CreateFromFirst("curve", hydroInfo.GetAllParterCodes());
-        //                    curveqe.Name = "鍖归厤";
-        //                    curveqe.ModelType = string.Empty;
-        //                    curveqe.DbLocked = false;
-        //                    curveqe.DbId = matching.MatchingCurveDbId;
-        //                    curveqe.CurveType = Yw.WinFrmUI.HydroCurve.PumpQE;
-        //                    curveqe.CurveData = matching.MatchingCurveQE?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
-        //                    if (hydroInfo.Curves == null)
-        //                    {
-        //                        hydroInfo.Curves = new List<Yw.Model.HydroCurveInfo>();
-        //                    }
-        //                    hydroInfo.Curves.Add(curveqe);
-        //                    pump.CurveQE = curveqe.Code;
-        //                }
-        //                else
-        //                {
-        //                    if (!curveqe.DbLocked)
-        //                    {
-        //                        curveqe.DbId = matching.MatchingCurveDbId;
-        //                        curveqe.CurveData = matching.MatchingCurveQE?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
-        //                    }
-        //                }
+            #region 鍥涢��
 
-        //            }
+            if (hydroInfo.Fourlinks != null && hydroInfo.Fourlinks.Count > 0)
+            {
+                if (matchingInfo.Fourlinks != null && matchingInfo.Fourlinks.Count > 0)
+                {
+                    hydroInfo.Fourlinks.ForEach(x =>
+                    {
+                        var matching = matchingInfo.Fourlinks.Find(t => t.Code == x.Code);
+                        if (Apply(hydroInfo, x, matching))
+                        {
+                            result = true;
+                        }
+                    });
+                }
+            }
 
-        //            result = true;
-        //        }
-        //    }
+            #endregion
 
-        //    return result;
-        //}
+            #region 鍠峰ご
 
-        ///// <summary>
-        ///// 搴旂敤闃�闂ㄨ嚜鍔ㄥ尮閰峍iewModel
-        ///// </summary>
-        //public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, ValveMatchingViewModel matching)
-        //{
-        //    if (hydroInfo == null)
-        //    {
-        //        return false;
-        //    }
-        //    if (matching == null)
-        //    {
-        //        return false;
-        //    }
+            if (hydroInfo.Nozzles != null && hydroInfo.Nozzles.Count > 0)
+            {
+                if (matchingInfo.Nozzles != null && matchingInfo.Nozzles.Count > 0)
+                {
+                    hydroInfo.Nozzles.ForEach(x =>
+                    {
+                        var matching = matchingInfo.Nozzles.Find(t => t.Code == x.Code);
+                        if (Apply(hydroInfo, x, matching))
+                        {
+                            result = true;
+                        }
+                    });
+                }
+            }
 
-        //    bool result = false;
+            #endregion
 
-        //    var valve = hydroInfo.Valves?.Find(x => x.Code == matching.Code);
-        //    if (valve != null)
-        //    {
-        //        valve.DbLocked = matching.DbLocked;
-        //        valve.ModelType = matching.ModelType;
-        //        valve.Material = matching.Material;
-        //        valve.Diameter = matching.Diameter;
-        //        valve.MinorLoss = matching.MinorLoss;
-        //        switch (matching.ValveType)
-        //        {
-        //            case HStation.Assets.eValveType.PBV: valve.ValveType = Yw.Hydro.ValveType.PBV; break;
-        //            case HStation.Assets.eValveType.PRV: valve.ValveType = Yw.Hydro.ValveType.PRV; break;
-        //            case HStation.Assets.eValveType.PSV: valve.ValveType = Yw.Hydro.ValveType.PSV; break;
-        //            case HStation.Assets.eValveType.TCV: valve.ValveType = Yw.Hydro.ValveType.TCV; break;
-        //            case HStation.Assets.eValveType.FCV: valve.ValveType = Yw.Hydro.ValveType.FCV; break;
-        //            case HStation.Assets.eValveType.GPV: valve.ValveType = Yw.Hydro.ValveType.GPV; break;
-        //            case HStation.Assets.eValveType.CV: valve.ValveType = Yw.Hydro.ValveType.CV; break;
-        //            default: break;
-        //        }
-        //        valve.ValveSetting = matching.ValveSetting;
+            #region 娑堢伀鏍�
 
-        //        if (!valve.DbLocked)
-        //        {
-        //            if (!string.IsNullOrEmpty(matching.MatchingDbId))
-        //            {
-        //                valve.DbId = matching.MatchingDbId;
-        //            }
-        //            if (!string.IsNullOrEmpty(matching.MatchingModelType))
-        //            {
-        //                valve.ModelType = matching.MatchingModelType;
-        //            }
-        //            if (!string.IsNullOrEmpty(matching.MatchingMaterial))
-        //            {
-        //                valve.Material = matching.MatchingMaterial;
-        //            }
-        //            if (matching.MatchingDiameter.HasValue)
-        //            {
-        //                valve.Diameter = matching.MatchingDiameter.Value;
-        //            }
-        //            if (matching.MatchingMinorLoss.HasValue)
-        //            {
-        //                valve.MinorLoss = matching.MatchingMinorLoss.Value;
-        //            }
-        //            if (matching.MatchingValveType.HasValue)
-        //            {
-        //                switch (matching.MatchingValveType.Value)
-        //                {
-        //                    case HStation.Assets.eValveType.PBV: valve.ValveType = Yw.Hydro.ValveType.PBV; break;
-        //                    case HStation.Assets.eValveType.PRV: valve.ValveType = Yw.Hydro.ValveType.PRV; break;
-        //                    case HStation.Assets.eValveType.PSV: valve.ValveType = Yw.Hydro.ValveType.PSV; break;
-        //                    case HStation.Assets.eValveType.TCV: valve.ValveType = Yw.Hydro.ValveType.TCV; break;
-        //                    case HStation.Assets.eValveType.FCV: valve.ValveType = Yw.Hydro.ValveType.FCV; break;
-        //                    case HStation.Assets.eValveType.GPV: valve.ValveType = Yw.Hydro.ValveType.GPV; break;
-        //                    case HStation.Assets.eValveType.CV: valve.ValveType = Yw.Hydro.ValveType.CV; break;
-        //                    default: break;
-        //                }
-        //            }
-        //            switch (valve.ValveType)
-        //            {
-        //                case Yw.Hydro.ValveType.PSV:
-        //                    {
-        //                        if (!string.IsNullOrEmpty(matching.MatchingValveSetting))
-        //                        {
-        //                            valve.ValveSetting = matching.MatchingValveSetting;
-        //                        }
-        //                    }
-        //                    break;
-        //                case Yw.Hydro.ValveType.PBV:
-        //                    {
-        //                        if (!string.IsNullOrEmpty(matching.MatchingValveSetting))
-        //                        {
-        //                            valve.ValveSetting = matching.MatchingValveSetting;
-        //                        }
-        //                    }
-        //                    break;
-        //                case Yw.Hydro.ValveType.PRV:
-        //                    {
-        //                        if (!string.IsNullOrEmpty(matching.MatchingValveSetting))
-        //                        {
-        //                            valve.ValveSetting = matching.MatchingValveSetting;
-        //                        }
-        //                    }
-        //                    break;
-        //                case Yw.Hydro.ValveType.FCV:
-        //                    {
-        //                        if (!string.IsNullOrEmpty(matching.MatchingValveSetting))
-        //                        {
-        //                            valve.ValveSetting = matching.MatchingValveSetting;
-        //                        }
-        //                    }
-        //                    break;
-        //                case Yw.Hydro.ValveType.TCV:
-        //                    {
-        //                        if (!string.IsNullOrEmpty(matching.MatchingCurveDbId))
-        //                        {
-        //                            //闃�闂ㄥ紑搴︽崯澶辩郴鏁版洸绾�
-        //                            var curveol = hydroInfo.Curves?.Find(x => x.Code == valve.ValveSetting);
-        //                            if (curveol == null)
-        //                            {
-        //                                curveol = new Yw.Model.HydroCurveInfo();
-        //                                curveol.Catalog = Yw.Hydro.ParterCatalog.Curve;
-        //                                curveol.Code = Yw.Untity.UniqueHelper.CreateFromFirst("curve", hydroInfo.GetAllParterCodes());
-        //                                curveol.Name = "鍖归厤";
-        //                                curveol.ModelType = valve.ModelType;
-        //                                curveol.DbLocked = false;
-        //                                curveol.DbId = matching.MatchingCurveDbId;
-        //                                curveol.CurveType = Yw.WinFrmUI.HydroCurve.ValveOL;
-        //                                curveol.CurveData = matching.MatchingCurveOL?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
-        //                                if (hydroInfo.Curves == null)
-        //                                {
-        //                                    hydroInfo.Curves = new List<Yw.Model.HydroCurveInfo>();
-        //                                }
-        //                                hydroInfo.Curves.Add(curveol);
-        //                                valve.ValveSetting = curveol.Code;
-        //                            }
-        //                            else
-        //                            {
-        //                                if (!curveol.DbLocked)
-        //                                {
-        //                                    curveol.DbId = matching.MatchingCurveDbId;
-        //                                    curveol.CurveData = matching.MatchingCurveOL?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
-        //                                }
-        //                            }
-        //                        }
-        //                    }
-        //                    break;
-        //                case Yw.Hydro.ValveType.GPV:
-        //                    {
-        //                        if (!string.IsNullOrEmpty(matching.MatchingCurveDbId))
-        //                        {
-        //                            //闃�闂ㄥ紑搴︽崯澶辩郴鏁版洸绾�
-        //                            var curveql = hydroInfo.Curves?.Find(x => x.Code == valve.ValveSetting);
-        //                            if (curveql == null)
-        //                            {
-        //                                curveql = new Yw.Model.HydroCurveInfo();
-        //                                curveql.Catalog = Yw.Hydro.ParterCatalog.Curve;
-        //                                curveql.Code = Yw.Untity.UniqueHelper.CreateFromFirst("curve", hydroInfo.GetAllParterCodes());
-        //                                curveql.Name = "鍖归厤";
-        //                                curveql.ModelType = valve.ModelType;
-        //                                curveql.DbLocked = false;
-        //                                curveql.DbId = matching.MatchingCurveDbId;
-        //                                curveql.CurveType = Yw.WinFrmUI.HydroCurve.ValveOL;
-        //                                curveql.CurveData = matching.MatchingCurveQL?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
-        //                                if (hydroInfo.Curves == null)
-        //                                {
-        //                                    hydroInfo.Curves = new List<Yw.Model.HydroCurveInfo>();
-        //                                }
-        //                                hydroInfo.Curves.Add(curveql);
-        //                                valve.ValveSetting = curveql.Code;
-        //                            }
-        //                            else
-        //                            {
-        //                                if (!curveql.DbLocked)
-        //                                {
-        //                                    curveql.DbId = matching.MatchingCurveDbId;
-        //                                    curveql.CurveData = matching.MatchingCurveQL?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
-        //                                }
-        //                            }
-        //                        }
-        //                    }
-        //                    break;
-        //                case Yw.Hydro.ValveType.CV:
-        //                    {
+            if (hydroInfo.Hydrants != null && hydroInfo.Hydrants.Count > 0)
+            {
+                if (matchingInfo.Hydrants != null && matchingInfo.Hydrants.Count > 0)
+                {
+                    hydroInfo.Hydrants.ForEach(x =>
+                    {
+                        var matching = matchingInfo.Hydrants.Find(t => t.Code == x.Code);
+                        if (Apply(hydroInfo, x, matching))
+                        {
+                            result = true;
+                        }
+                    });
+                }
+            }
 
-        //                    }
-        //                    break;
-        //            }
+            #endregion
 
-        //            result = true;
-        //        }
-        //    }
-        //    return result;
-        //}
+            #region 姘磋〃
 
-        ///// <summary>
-        ///// 搴旂敤绠¢亾鑷姩鍖归厤ViewModel
-        ///// </summary>
-        //public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, PipeMatchingViewModel matching)
-        //{
-        //    if (hydroInfo == null)
-        //    {
-        //        return false;
-        //    }
-        //    if (matching == null)
-        //    {
-        //        return false;
-        //    }
+            if (hydroInfo.Meters != null && hydroInfo.Meters.Count > 0)
+            {
+                if (matchingInfo.Meters != null && matchingInfo.Meters.Count > 0)
+                {
+                    hydroInfo.Meters.ForEach(x =>
+                    {
+                        var matching = matchingInfo.Meters.Find(t => t.Code == x.Code);
+                        if (Apply(hydroInfo, x, matching))
+                        {
+                            result = true;
+                        }
+                    });
+                }
+            }
 
-        //    bool result = false;
+            #endregion
 
-        //    var pipe = hydroInfo.Pipes?.Find(x => x.Code == matching.Code);
-        //    if (pipe != null)
-        //    {
-        //        pipe.DbLocked = matching.DbLocked;
-        //        pipe.ModelType = matching.ModelType;
-        //        pipe.Diameter = matching.Diameter;
-        //        pipe.Material = matching.Material;
-        //        pipe.Roughness = matching.Roughness;
-        //        pipe.MinorLoss = matching.MinorLoss;
+            #region 娴侀噺璁�
 
-        //        if (!pipe.DbLocked)
-        //        {
-        //            if (!string.IsNullOrEmpty(matching.MatchingModelType))
-        //            {
-        //                pipe.ModelType = matching.MatchingModelType;
-        //            }
-        //            if (!string.IsNullOrEmpty(matching.MatchingDbId))
-        //            {
-        //                pipe.DbId = matching.MatchingDbId;
-        //            }
-        //            if (matching.MatchingDiameter.HasValue)
-        //            {
-        //                pipe.Diameter = matching.MatchingDiameter.Value;
-        //            }
-        //            if (!string.IsNullOrEmpty(matching.MatchingMaterial))
-        //            {
-        //                pipe.Material = matching.MatchingMaterial;
-        //            }
-        //            if (matching.MatchingRoughness.HasValue)
-        //            {
-        //                pipe.Roughness = matching.MatchingRoughness.Value;
-        //            }
-        //            if (matching.MatchingMinorLoss.HasValue)
-        //            {
-        //                pipe.MinorLoss = matching.MatchingMinorLoss.Value;
-        //            }
+            if (hydroInfo.Flowmeters != null && hydroInfo.Flowmeters.Count > 0)
+            {
+                if (matchingInfo.Flowmeters != null && matchingInfo.Flowmeters.Count > 0)
+                {
+                    hydroInfo.Flowmeters.ForEach(x =>
+                    {
+                        var matching = matchingInfo.Flowmeters.Find(t => t.Code == x.Code);
+                        if (Apply(hydroInfo, x, matching))
+                        {
+                            result = true;
+                        }
+                    });
+                }
+            }
 
-        //            result = true;
-        //        }
-        //    }
-        //    return result;
-        //}
+            #endregion
 
-        ///// <summary>
-        ///// 搴旂敤寮ご鑷姩鍖归厤ViewModel
-        ///// </summary>
-        //public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, ElbowMatchingViewModel matching)
-        //{
-        //    if (hydroInfo == null)
-        //    {
-        //        return false;
-        //    }
-        //    if (matching == null)
-        //    {
-        //        return false;
-        //    }
+            #region 鍘嬪姏琛�
 
-        //    bool result = false;
+            if (hydroInfo.Pressmeters != null && hydroInfo.Pressmeters.Count > 0)
+            {
+                if (matchingInfo.Pressmeters != null && matchingInfo.Pressmeters.Count > 0)
+                {
+                    hydroInfo.Pressmeters.ForEach(x =>
+                    {
+                        var matching = matchingInfo.Pressmeters.Find(t => t.Code == x.Code);
+                        if (Apply(hydroInfo, x, matching))
+                        {
+                            result = true;
+                        }
+                    });
+                }
+            }
 
-        //    var elbow = hydroInfo.Elbows?.Find(x => x.Code == matching.Code);
-        //    if (elbow != null)
-        //    {
-        //        elbow.DbLocked = matching.DbLocked;
-        //        elbow.ModelType = matching.ModelType;
-        //        elbow.Caliber = matching.Caliber;
-        //        elbow.Material = matching.Material;
-        //        elbow.MinorLoss = matching.MinorLoss;
+            #endregion
 
-        //        if (!elbow.DbLocked)
-        //        {
-        //            if (!string.IsNullOrEmpty(matching.MatchingModelType))
-        //            {
-        //                elbow.ModelType = matching.MatchingModelType;
-        //            }
-        //            if (!string.IsNullOrEmpty(matching.MatchingDbId))
-        //            {
-        //                elbow.DbId = matching.MatchingDbId;
-        //            }
-        //            if (matching.MatchingCaliber.HasValue)
-        //            {
-        //                elbow.Caliber = matching.MatchingCaliber.Value;
-        //            }
-        //            if (!string.IsNullOrEmpty(matching.MatchingMaterial))
-        //            {
-        //                elbow.Material = matching.MatchingMaterial;
-        //            }
-        //            if (matching.MatchingMinorLoss.HasValue)
-        //            {
-        //                elbow.MinorLoss = matching.MatchingMinorLoss.Value;
-        //            }
+            #region 绠¢亾
 
-        //            result = true;
-        //        }
-        //    }
-        //    return result;
-        //}
+            if (hydroInfo.Pipes != null && hydroInfo.Pipes.Count > 0)
+            {
+                if (matchingInfo.Pipes != null && matchingInfo.Pipes.Count > 0)
+                {
+                    hydroInfo.Pipes.ForEach(x =>
+                    {
+                        var matching = matchingInfo.Pipes.Find(t => t.Code == x.Code);
+                        if (Apply(hydroInfo, x, matching))
+                        {
+                            result = true;
+                        }
+                    });
+                }
+            }
 
-        ///// <summary>
-        ///// 搴旂敤涓夐�氳嚜鍔ㄥ尮閰峍iewModel
-        ///// </summary>
-        //public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, ThreelinkMatchingViewModel matching)
-        //{
-        //    if (hydroInfo == null)
-        //    {
-        //        return false;
-        //    }
-        //    if (matching == null)
-        //    {
-        //        return false;
-        //    }
+            #endregion
 
-        //    bool result = false;
+            #region 杩囨浮浠�
 
-        //    var threelink = hydroInfo.Threelinks?.Find(x => x.Code == matching.Code);
-        //    if (threelink != null)
-        //    {
-        //        threelink.DbLocked = matching.DbLocked;
-        //        threelink.ModelType = matching.ModelType;
-        //        threelink.Caliber = matching.Caliber;
-        //        threelink.Material = matching.Material;
-        //        threelink.MinorLoss = matching.MinorLoss;
+            if (hydroInfo.Translations != null && hydroInfo.Translations.Count > 0)
+            {
+                if (matchingInfo.Translations != null && matchingInfo.Translations.Count > 0)
+                {
+                    hydroInfo.Translations.ForEach(x =>
+                    {
+                        var matching = matchingInfo.Translations.Find(t => t.Code == x.Code);
+                        if (Apply(hydroInfo, x, matching))
+                        {
+                            result = true;
+                        }
+                    });
+                }
+            }
 
-        //        if (!threelink.DbLocked)
-        //        {
-        //            if (!string.IsNullOrEmpty(matching.MatchingModelType))
-        //            {
-        //                threelink.ModelType = matching.MatchingModelType;
-        //            }
-        //            if (!string.IsNullOrEmpty(matching.MatchingDbId))
-        //            {
-        //                threelink.DbId = matching.MatchingDbId;
-        //            }
-        //            if (matching.MatchingCaliber.HasValue)
-        //            {
-        //                threelink.Caliber = matching.MatchingCaliber.Value;
-        //            }
-        //            if (!string.IsNullOrEmpty(matching.MatchingMaterial))
-        //            {
-        //                threelink.Material = matching.MatchingMaterial;
-        //            }
-        //            if (matching.MatchingMinorLoss.HasValue)
-        //            {
-        //                threelink.MinorLoss = matching.MatchingMinorLoss.Value;
-        //            }
+            #endregion
 
-        //            result = true;
-        //        }
-        //    }
-        //    return result;
-        //}
+            #region 姘存车
 
-        ///// <summary>
-        ///// 搴旂敤鍥涢�氳嚜鍔ㄥ尮閰峍iewModel
-        ///// </summary>
-        //public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, FourlinkMatchingViewModel matching)
-        //{
-        //    if (hydroInfo == null)
-        //    {
-        //        return false;
-        //    }
-        //    if (matching == null)
-        //    {
-        //        return false;
-        //    }
+            if (hydroInfo.Pumps != null && hydroInfo.Pumps.Count > 0)
+            {
+                if (matchingInfo.Pumps != null && matchingInfo.Pumps.Count > 0)
+                {
+                    hydroInfo.Pumps.ForEach(x =>
+                    {
+                        var matching = matchingInfo.Pumps.Find(t => t.Code == x.Code);
+                        if (Apply(hydroInfo, x, matching))
+                        {
+                            result = true;
+                        }
+                    });
+                }
+            }
 
-        //    bool result = false;
+            #endregion
 
-        //    var fourlink = hydroInfo.Fourlinks?.Find(x => x.Code == matching.Code);
-        //    if (fourlink != null)
-        //    {
-        //        fourlink.DbLocked = matching.DbLocked;
-        //        fourlink.ModelType = matching.ModelType;
-        //        fourlink.Caliber = matching.Caliber;
-        //        fourlink.Material = matching.Material;
-        //        fourlink.MinorLoss = matching.MinorLoss;
+            #region 闃�闂�
 
-        //        if (!fourlink.DbLocked)
-        //        {
-        //            if (!string.IsNullOrEmpty(matching.MatchingModelType))
-        //            {
-        //                fourlink.ModelType = matching.MatchingModelType;
-        //            }
-        //            if (!string.IsNullOrEmpty(matching.MatchingDbId))
-        //            {
-        //                fourlink.DbId = matching.MatchingDbId;
-        //            }
-        //            if (matching.MatchingCaliber.HasValue)
-        //            {
-        //                fourlink.Caliber = matching.MatchingCaliber.Value;
-        //            }
-        //            if (!string.IsNullOrEmpty(matching.MatchingMaterial))
-        //            {
-        //                fourlink.Material = matching.MatchingMaterial;
-        //            }
-        //            if (matching.MatchingMinorLoss.HasValue)
-        //            {
-        //                fourlink.MinorLoss = matching.MatchingMinorLoss.Value;
-        //            }
+            if (hydroInfo.Valves != null && hydroInfo.Valves.Count > 0)
+            {
+                if (matchingInfo.Valves != null && matchingInfo.Valves.Count > 0)
+                {
+                    hydroInfo.Valves.ForEach(x =>
+                    {
+                        var matching = matchingInfo.Valves.Find(t => t.Code == x.Code);
+                        if (Apply(hydroInfo, x, matching))
+                        {
+                            result = true;
+                        }
+                    });
+                }
+            }
 
-        //            result = true;
-        //        }
-        //    }
-        //    return result;
-        //}
+            #endregion
+
+            #region 鎹㈢儹鍣�
+
+            if (hydroInfo.Exchangers != null && hydroInfo.Exchangers.Count > 0)
+            {
+                if (matchingInfo.Exchangers != null && matchingInfo.Exchangers.Count > 0)
+                {
+                    hydroInfo.Exchangers.ForEach(x =>
+                    {
+                        var matching = matchingInfo.Exchangers.Find(t => t.Code == x.Code);
+                        if (Apply(hydroInfo, x, matching))
+                        {
+                            result = true;
+                        }
+                    });
+                }
+            }
+
+            #endregion
+
+            #region 绌哄帇鏈�
+
+            if (hydroInfo.Compressors != null && hydroInfo.Compressors.Count > 0)
+            {
+                if (matchingInfo.Compressors != null && matchingInfo.Compressors.Count > 0)
+                {
+                    hydroInfo.Compressors.ForEach(x =>
+                    {
+                        var matching = matchingInfo.Compressors.Find(t => t.Code == x.Code);
+                        if (Apply(hydroInfo, x, matching))
+                        {
+                            result = true;
+                        }
+                    });
+                }
+            }
+
+            #endregion
+
+            return result;
+        }
+
+        #region 姘存睜
+
+        /// <summary>
+        /// 搴旂敤
+        /// </summary>
+        public static bool Apply(HydroTankViewModel visualViewModel, HydroTankMatchingViewModel matching)
+        {
+            var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching);
+            visualViewModel.UpdateProperty();
+            return bol;
+        }
+
+        /// <summary>
+        /// 搴旂敤
+        /// </summary>
+        public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroTankInfo visual, HydroTankMatchingViewModel matching)
+        {
+            if (hydroInfo == null)
+            {
+                return false;
+            }
+            if (visual == null)
+            {
+                return false;
+            }
+            if (matching == null)
+            {
+                return false;
+            }
+            visual.Name = matching.Name;
+            visual.DbLocked = matching.DbLocked;
+            visual.DbId = matching.DbId;
+            visual.ModelType = matching.ModelType;
+            visual.MinLevel = matching.MinLevel;
+            visual.MaxLevel = matching.MaxLevel;
+            visual.DN = matching.DN;
+            visual.MinVol = matching.MinVol;
+            visual.OverFlow = matching.OverFlow;
+
+            bool result = false;
+            if (!visual.DbLocked)
+            {
+                if (!string.IsNullOrEmpty(matching.MatchingModelType))
+                {
+                    visual.UpdatePropStatus(nameof(visual.ModelType), ePropStatus.Matching, "閫氳繃鍩虹鏁版嵁鍖归厤淇");
+                    visual.ModelType = matching.MatchingModelType;
+                    result = true;
+                }
+                if (!string.IsNullOrEmpty(matching.MatchingDbId))
+                {
+                    visual.UpdatePropStatus(nameof(visual.DbId), ePropStatus.Matching, "閫氳繃鍩虹鏁版嵁鍖归厤淇");
+                    visual.DbId = matching.MatchingDbId;
+                    result = true;
+                }
+                if (matching.MatchingMinLevel.HasValue)
+                {
+                    visual.UpdatePropStatus(nameof(visual.MinLevel), ePropStatus.Matching, "閫氳繃鍩虹鏁版嵁鍖归厤淇");
+                    visual.MinLevel = matching.MatchingMinLevel.Value;
+                    result = true;
+                }
+                if (matching.MatchingMaxLevel.HasValue)
+                {
+                    visual.UpdatePropStatus(nameof(visual.MaxLevel), ePropStatus.Matching, "閫氳繃鍩虹鏁版嵁鍖归厤淇");
+                    visual.MaxLevel = matching.MatchingMaxLevel.Value;
+                    result = true;
+                }
+                if (matching.MatchingDN.HasValue)
+                {
+                    visual.UpdatePropStatus(nameof(visual.DN), ePropStatus.Matching, "閫氳繃鍩虹鏁版嵁鍖归厤淇");
+                    visual.DN = matching.MatchingDN.Value;
+                    result = true;
+                }
+                if (matching.MatchingMinVol.HasValue)
+                {
+                    visual.UpdatePropStatus(nameof(visual.MinVol), ePropStatus.Matching, "閫氳繃鍩虹鏁版嵁鍖归厤淇");
+                    visual.MinVol = matching.MatchingMinVol.Value;
+                    result = true;
+                }
+                if (matching.MatchingOverFlow.HasValue)
+                {
+                    visual.UpdatePropStatus(nameof(visual.OverFlow), ePropStatus.Matching, "閫氳繃鍩虹鏁版嵁鍖归厤淇");
+                    visual.OverFlow = matching.MatchingOverFlow.Value;
+                    result = true;
+                }
+                if (!string.IsNullOrEmpty(matching.MatchingCurveDbId))
+                {
+                    var curvevol = hydroInfo.Curves?.Find(x => x.Code == visual.VolCurve);
+                    if (curvevol == null)
+                    {
+                        curvevol = new Yw.Model.HydroCurveInfo();
+                        curvevol.Catalog = Yw.Hydro.ParterCatalog.Curve;
+                        curvevol.Code = Yw.Untity.UniqueHelper.CreateFromFirst("curve", hydroInfo.GetAllParterCodes());
+                        curvevol.Name = "鍖归厤";
+                        curvevol.ModelType = string.Empty;
+                        curvevol.DbLocked = false;
+                        curvevol.DbId = matching.MatchingCurveDbId;
+                        curvevol.CurveType = Yw.WinFrmUI.HydroCurve.TankVol;
+                        curvevol.CurveData = matching.MatchingVolCurve?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
+                        if (hydroInfo.Curves == null)
+                        {
+                            hydroInfo.Curves = new List<Yw.Model.HydroCurveInfo>();
+                        }
+                        hydroInfo.Curves.Add(curvevol);
+                        visual.VolCurve = curvevol.Code;
+                        result = true;
+                    }
+                    else
+                    {
+                        if (!curvevol.DbLocked)
+                        {
+                            curvevol.DbId = matching.MatchingCurveDbId;
+                            curvevol.CurveData = matching.MatchingVolCurve?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
+                            result = true;
+                        }
+                    }
+                }
+            }
+            return result;
+        }
+
+        #endregion
+
+        #region 闂峰ご
+
+        /// <summary>
+        /// 搴旂敤
+        /// </summary>
+        public static bool Apply(HydroBluntheadViewModel visualViewModel, HydroBluntheadMatchingViewModel matching)
+        {
+            var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching);
+            visualViewModel.UpdateProperty();
+            return bol;
+        }
+
+        /// <summary>
+        /// 搴旂敤
+        /// </summary>
+        public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroBluntheadInfo visual, HydroBluntheadMatchingViewModel matching)
+        {
+            if (hydroInfo == null)
+            {
+                return false;
+            }
+            if (visual == null)
+            {
+                return false;
+            }
+            if (matching == null)
+            {
+                return false;
+            }
+            visual.Name = matching.Name;
+            visual.DbLocked = matching.DbLocked;
+            visual.DbId = matching.DbId;
+            visual.ModelType = matching.ModelType;
+            visual.Caliber = matching.Caliber;
+            visual.Material = matching.Material;
+            visual.MinorLoss = matching.MinorLoss;
+
+            bool result = false;
+            if (!visual.DbLocked)
+            {
+                if (!string.IsNullOrEmpty(matching.MatchingModelType))
+                {
+                    visual.ModelType = matching.MatchingModelType;
+                    result = true;
+                }
+                if (!string.IsNullOrEmpty(matching.MatchingDbId))
+                {
+                    visual.DbId = matching.MatchingDbId;
+                    result = true;
+                }
+                if (matching.MatchingCaliber.HasValue)
+                {
+                    visual.Caliber = matching.MatchingCaliber.Value;
+                    result = true;
+                }
+                if (!string.IsNullOrEmpty(matching.MatchingMaterial))
+                {
+                    visual.Material = matching.MatchingMaterial;
+                    result = true;
+                }
+                if (matching.MatchingMinorLoss.HasValue)
+                {
+                    visual.MinorLoss = matching.MatchingMinorLoss.Value;
+                    result = true;
+                }
+            }
+            return result;
+        }
+
+        #endregion
+
+        #region 寮ご
+
+        /// <summary>
+        /// 搴旂敤
+        /// </summary>
+        public static bool Apply(HydroElbowViewModel visualViewModel, HydroElbowMatchingViewModel matching)
+        {
+            var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching);
+            visualViewModel.UpdateProperty();
+            return bol;
+        }
+
+        /// <summary>
+        /// 搴旂敤
+        /// </summary>
+        public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroElbowInfo visual, HydroElbowMatchingViewModel matching)
+        {
+            if (hydroInfo == null)
+            {
+                return false;
+            }
+            if (visual == null)
+            {
+                return false;
+            }
+            if (matching == null)
+            {
+                return false;
+            }
+            visual.Name = matching.Name;
+            visual.DbLocked = matching.DbLocked;
+            visual.DbId = matching.DbId;
+            visual.ModelType = matching.ModelType;
+            visual.Caliber = matching.Caliber;
+            visual.Material = matching.Material;
+            visual.MinorLoss = matching.MinorLoss;
+            visual.BendingAngle = matching.BendingAngle;
+            if (matching.ElbowType.HasValue)
+            {
+                visual.ElbowType = HydroElbowTypeEnumHelper.GetElbowTypeName(matching.ElbowType.Value);
+            }
+
+            bool result = false;
+            if (!visual.DbLocked)
+            {
+                if (!string.IsNullOrEmpty(matching.MatchingModelType))
+                {
+                    visual.ModelType = matching.MatchingModelType;
+                    result = true;
+                }
+                if (!string.IsNullOrEmpty(matching.MatchingDbId))
+                {
+                    visual.DbId = matching.MatchingDbId;
+                    result = true;
+                }
+                if (matching.MatchingCaliber.HasValue)
+                {
+                    visual.Caliber = matching.MatchingCaliber.Value;
+                    result = true;
+                }
+                if (!string.IsNullOrEmpty(matching.MatchingMaterial))
+                {
+                    visual.Material = matching.MatchingMaterial;
+                    result = true;
+                }
+                if (matching.MatchingMinorLoss.HasValue)
+                {
+                    visual.MinorLoss = matching.MatchingMinorLoss.Value;
+                    result = true;
+                }
+                if (matching.MatchingBendingAngle.HasValue)
+                {
+                    visual.BendingAngle = matching.MatchingBendingAngle.Value;
+                    result = true;
+                }
+                if (matching.MatchingElbowType.HasValue)
+                {
+                    visual.ElbowType = HydroElbowTypeEnumHelper.GetElbowTypeName(matching.MatchingElbowType.Value);
+                    result = true;
+                }
+            }
+            return result;
+        }
+
+        #endregion
+
+        #region 涓夐��
+
+        /// <summary>
+        /// 搴旂敤
+        /// </summary>
+        public static bool Apply(HydroThreelinkViewModel visualViewModel, HydroThreelinkMatchingViewModel matching)
+        {
+            var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching);
+            visualViewModel.UpdateProperty();
+            return bol;
+        }
+
+        /// <summary>
+        /// 搴旂敤
+        /// </summary>
+        public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroThreelinkInfo visual, HydroThreelinkMatchingViewModel matching)
+        {
+            if (hydroInfo == null)
+            {
+                return false;
+            }
+            if (visual == null)
+            {
+                return false;
+            }
+            if (matching == null)
+            {
+                return false;
+            }
+            visual.Name = matching.Name;
+            visual.DbLocked = matching.DbLocked;
+            visual.DbId = matching.DbId;
+            visual.ModelType = matching.ModelType;
+            visual.Caliber = matching.Caliber;
+            visual.Material = matching.Material;
+            visual.MinorLoss = matching.MinorLoss;
+            visual.RunningThroughLoss = matching.RunningThroughLoss;
+            visual.BranchThroughLoss = matching.BranchThroughLoss;
+
+            bool result = false;
+            if (!visual.DbLocked)
+            {
+                if (!string.IsNullOrEmpty(matching.MatchingModelType))
+                {
+                    visual.ModelType = matching.MatchingModelType;
+                    result = true;
+                }
+                if (!string.IsNullOrEmpty(matching.MatchingDbId))
+                {
+                    visual.DbId = matching.MatchingDbId;
+                    result = true;
+                }
+                if (matching.MatchingCaliber.HasValue)
+                {
+                    visual.Caliber = matching.MatchingCaliber.Value;
+                    result = true;
+                }
+                if (!string.IsNullOrEmpty(matching.MatchingMaterial))
+                {
+                    visual.Material = matching.MatchingMaterial;
+                    result = true;
+                }
+                if (matching.MatchingMinorLoss.HasValue)
+                {
+                    visual.MinorLoss = matching.MatchingMinorLoss.Value;
+                    result = true;
+                }
+                if (matching.MatchingRunningThroughLoss.HasValue)
+                {
+                    visual.RunningThroughLoss = matching.MatchingRunningThroughLoss.Value;
+                    result = true;
+                }
+                if (matching.MatchingBranchThroughLoss.HasValue)
+                {
+                    visual.BranchThroughLoss = matching.MatchingBranchThroughLoss.Value;
+                    result = true;
+                }
+            }
+            return result;
+        }
+
+        #endregion
+
+        #region 鍥涢��
+
+        /// <summary>
+        /// 搴旂敤
+        /// </summary>
+        public static bool Apply(HydroFourlinkViewModel visualViewModel, HydroFourlinkMatchingViewModel matching)
+        {
+            var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching);
+            visualViewModel.UpdateProperty();
+            return bol;
+        }
+
+        /// <summary>
+        /// 搴旂敤
+        /// </summary>
+        public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroFourlinkInfo visual, HydroFourlinkMatchingViewModel matching)
+        {
+            if (hydroInfo == null)
+            {
+                return false;
+            }
+            if (visual == null)
+            {
+                return false;
+            }
+            if (matching == null)
+            {
+                return false;
+            }
+            visual.Name = matching.Name;
+            visual.DbLocked = matching.DbLocked;
+            visual.DbId = matching.DbId;
+            visual.ModelType = matching.ModelType;
+            visual.Caliber = matching.Caliber;
+            visual.Material = matching.Material;
+            visual.MinorLoss = matching.MinorLoss;
+
+            bool result = false;
+            if (!visual.DbLocked)
+            {
+                if (!string.IsNullOrEmpty(matching.MatchingModelType))
+                {
+                    visual.ModelType = matching.MatchingModelType;
+                    result = true;
+                }
+                if (!string.IsNullOrEmpty(matching.MatchingDbId))
+                {
+                    visual.DbId = matching.MatchingDbId;
+                    result = true;
+                }
+                if (matching.MatchingCaliber.HasValue)
+                {
+                    visual.Caliber = matching.MatchingCaliber.Value;
+                    result = true;
+                }
+                if (!string.IsNullOrEmpty(matching.MatchingMaterial))
+                {
+                    visual.Material = matching.MatchingMaterial;
+                    result = true;
+                }
+                if (matching.MatchingMinorLoss.HasValue)
+                {
+                    visual.MinorLoss = matching.MatchingMinorLoss.Value;
+                    result = true;
+                }
+            }
+            return result;
+        }
+
+        #endregion
+
+        #region 鍠峰ご
+
+        /// <summary>
+        /// 搴旂敤
+        /// </summary>
+        public static bool Apply(HydroNozzleViewModel visualViewModel, HydroNozzleMatchingViewModel matching)
+        {
+            var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching);
+            visualViewModel.UpdateProperty();
+            return bol;
+        }
+
+        /// <summary>
+        /// 搴旂敤
+        /// </summary>
+        public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroNozzleInfo visual, HydroNozzleMatchingViewModel matching)
+        {
+            if (hydroInfo == null)
+            {
+                return false;
+            }
+            if (visual == null)
+            {
+                return false;
+            }
+            if (matching == null)
+            {
+                return false;
+            }
+            visual.Name = matching.Name;
+            visual.DbLocked = matching.DbLocked;
+            visual.DbId = matching.DbId;
+            visual.ModelType = matching.ModelType;
+            visual.Material = matching.Material;
+            visual.Caliber = matching.Caliber;
+            visual.MinorLoss = matching.MinorLoss;
+            visual.Coefficient = matching.Coefficient;
+
+            bool result = false;
+            if (!visual.DbLocked)
+            {
+                if (!string.IsNullOrEmpty(matching.MatchingModelType))
+                {
+                    visual.ModelType = matching.MatchingModelType;
+                    result = true;
+                }
+                if (!string.IsNullOrEmpty(matching.MatchingDbId))
+                {
+                    visual.DbId = matching.MatchingDbId;
+                    result = true;
+                }
+                if (matching.MatchingCaliber.HasValue)
+                {
+                    visual.Caliber = matching.MatchingCaliber.Value;
+                    result = true;
+                }
+                if (!string.IsNullOrEmpty(matching.MatchingMaterial))
+                {
+                    visual.Material = matching.MatchingMaterial;
+                    result = true;
+                }
+                if (matching.MatchingMinorLoss.HasValue)
+                {
+                    visual.MinorLoss = matching.MatchingMinorLoss.Value;
+                    result = true;
+                }
+                if (matching.MatchingCoefficient.HasValue)
+                {
+                    visual.Coefficient = matching.MatchingCoefficient.Value;
+                    result = true;
+                }
+            }
+            return result;
+        }
+
+        #endregion
+
+        #region 娑堢伀鏍�
+
+        /// <summary>
+        /// 搴旂敤
+        /// </summary>
+        public static bool Apply(HydroHydrantViewModel visualViewModel, HydroHydrantMatchingViewModel matching)
+        {
+            var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching);
+            visualViewModel.UpdateProperty();
+            return bol;
+        }
+
+        /// <summary>
+        /// 搴旂敤
+        /// </summary>
+        public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroHydrantInfo visual, HydroHydrantMatchingViewModel matching)
+        {
+            if (hydroInfo == null)
+            {
+                return false;
+            }
+            if (visual == null)
+            {
+                return false;
+            }
+            if (matching == null)
+            {
+                return false;
+            }
+            visual.Name = matching.Name;
+            visual.DbLocked = matching.DbLocked;
+            visual.DbId = matching.DbId;
+            visual.ModelType = matching.ModelType;
+            visual.Material = matching.Material;
+            visual.Caliber = matching.Caliber;
+            visual.MinorLoss = matching.MinorLoss;
+            visual.Coefficient = matching.Coefficient;
+
+            bool result = false;
+            if (!visual.DbLocked)
+            {
+                if (!string.IsNullOrEmpty(matching.MatchingModelType))
+                {
+                    visual.ModelType = matching.MatchingModelType;
+                    result = true;
+                }
+                if (!string.IsNullOrEmpty(matching.MatchingDbId))
+                {
+                    visual.DbId = matching.MatchingDbId;
+                    result = true;
+                }
+                if (matching.MatchingCaliber.HasValue)
+                {
+                    visual.Caliber = matching.MatchingCaliber.Value;
+                    result = true;
+                }
+                if (!string.IsNullOrEmpty(matching.MatchingMaterial))
+                {
+                    visual.Material = matching.MatchingMaterial;
+                    result = true;
+                }
+                if (matching.MatchingMinorLoss.HasValue)
+                {
+                    visual.MinorLoss = matching.MatchingMinorLoss.Value;
+                    result = true;
+                }
+                if (matching.MatchingCoefficient.HasValue)
+                {
+                    visual.Coefficient = matching.MatchingCoefficient.Value;
+                    result = true;
+                }
+            }
+            return result;
+        }
+
+        #endregion
+
+        #region 姘磋〃
+
+        /// <summary>
+        /// 搴旂敤
+        /// </summary>
+        public static bool Apply(HydroMeterViewModel visualViewModel, HydroMeterMatchingViewModel matching)
+        {
+            var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching);
+            visualViewModel.UpdateProperty();
+            return bol;
+        }
+
+        /// <summary>
+        /// 搴旂敤
+        /// </summary>
+        public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroMeterInfo visual, HydroMeterMatchingViewModel matching)
+        {
+            if (hydroInfo == null)
+            {
+                return false;
+            }
+            if (visual == null)
+            {
+                return false;
+            }
+            if (matching == null)
+            {
+                return false;
+            }
+            visual.Name = matching.Name;
+            visual.DbLocked = matching.DbLocked;
+            visual.DbId = matching.DbId;
+            visual.ModelType = matching.ModelType;
+            visual.MinorLoss = matching.MinorLoss;
+
+            bool result = false;
+            if (!visual.DbLocked)
+            {
+                if (!string.IsNullOrEmpty(matching.MatchingModelType))
+                {
+                    visual.ModelType = matching.MatchingModelType;
+                    result = true;
+                }
+                if (!string.IsNullOrEmpty(matching.MatchingDbId))
+                {
+                    visual.DbId = matching.MatchingDbId;
+                    result = true;
+                }
+                if (matching.MatchingMinorLoss.HasValue)
+                {
+                    visual.MinorLoss = matching.MatchingMinorLoss.Value;
+                    result = true;
+                }
+            }
+            return result;
+        }
+
+        #endregion
+
+        #region 娴侀噺璁�
+
+        /// <summary>
+        /// 搴旂敤
+        /// </summary>
+        public static bool Apply(HydroFlowmeterViewModel visualViewModel, HydroFlowmeterMatchingViewModel matching)
+        {
+            var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching);
+            visualViewModel.UpdateProperty();
+            return bol;
+        }
+
+        /// <summary>
+        /// 搴旂敤
+        /// </summary>
+        public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroFlowmeterInfo visual, HydroFlowmeterMatchingViewModel matching)
+        {
+            if (hydroInfo == null)
+            {
+                return false;
+            }
+            if (visual == null)
+            {
+                return false;
+            }
+            if (matching == null)
+            {
+                return false;
+            }
+            visual.Name = matching.Name;
+            visual.DbLocked = matching.DbLocked;
+            visual.DbId = matching.DbId;
+            visual.ModelType = matching.ModelType;
+            visual.MinorLoss = matching.MinorLoss;
+
+            bool result = false;
+            if (!visual.DbLocked)
+            {
+                if (!string.IsNullOrEmpty(matching.MatchingModelType))
+                {
+                    visual.ModelType = matching.MatchingModelType;
+                    result = true;
+                }
+                if (!string.IsNullOrEmpty(matching.MatchingDbId))
+                {
+                    visual.DbId = matching.MatchingDbId;
+                    result = true;
+                }
+                if (matching.MatchingMinorLoss.HasValue)
+                {
+                    visual.MinorLoss = matching.MatchingMinorLoss.Value;
+                    result = true;
+                }
+            }
+            return result;
+        }
+
+        #endregion
+
+        #region 鍘嬪姏琛�
+
+        /// <summary>
+        /// 搴旂敤
+        /// </summary>
+        public static bool Apply(HydroPressmeterViewModel visualViewModel, HydroPressmeterMatchingViewModel matching)
+        {
+            var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching);
+            visualViewModel.UpdateProperty();
+            return bol;
+        }
+
+        /// <summary>
+        /// 搴旂敤
+        /// </summary>
+        public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroPressmeterInfo visual, HydroPressmeterMatchingViewModel matching)
+        {
+            if (hydroInfo == null)
+            {
+                return false;
+            }
+            if (visual == null)
+            {
+                return false;
+            }
+            if (matching == null)
+            {
+                return false;
+            }
+            visual.Name = matching.Name;
+            visual.DbLocked = matching.DbLocked;
+            visual.DbId = matching.DbId;
+            visual.ModelType = matching.ModelType;
+            visual.MinorLoss = matching.MinorLoss;
+
+            bool result = false;
+            if (!visual.DbLocked)
+            {
+                if (!string.IsNullOrEmpty(matching.MatchingModelType))
+                {
+                    visual.ModelType = matching.MatchingModelType;
+                    result = true;
+                }
+                if (!string.IsNullOrEmpty(matching.MatchingDbId))
+                {
+                    visual.DbId = matching.MatchingDbId;
+                    result = true;
+                }
+                if (matching.MatchingMinorLoss.HasValue)
+                {
+                    visual.MinorLoss = matching.MatchingMinorLoss.Value;
+                    result = true;
+                }
+            }
+            return result;
+        }
+
+        #endregion
+
+        #region 绠¢亾
+
+        /// <summary>
+        /// 搴旂敤
+        /// </summary>
+        public static bool Apply(HydroPipeViewModel visualViewModel, HydroPipeMatchingViewModel matching)
+        {
+            var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching);
+            visualViewModel.UpdateProperty();
+            return bol;
+        }
+
+        /// <summary>
+        /// 搴旂敤
+        /// </summary>
+        public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroPipeInfo visual, HydroPipeMatchingViewModel matching)
+        {
+            if (hydroInfo == null)
+            {
+                return false;
+            }
+            if (visual == null)
+            {
+                return false;
+            }
+            if (matching == null)
+            {
+                return false;
+            }
+
+            visual.Name = matching.Name;
+            visual.DbLocked = matching.DbLocked;
+            visual.DbId = matching.DbId;
+            visual.ModelType = matching.ModelType;
+            visual.Material = matching.Material;
+            visual.Diameter = matching.Diameter;
+            visual.Roughness = matching.Roughness;
+            visual.MinorLoss = matching.MinorLoss;
+
+            bool result = false;
+
+            if (!visual.DbLocked)
+            {
+                if (!string.IsNullOrEmpty(matching.MatchingModelType))
+                {
+                    visual.ModelType = matching.MatchingModelType;
+                    result = true;
+                }
+                if (!string.IsNullOrEmpty(matching.MatchingDbId))
+                {
+                    visual.DbId = matching.MatchingDbId;
+                    result = true;
+                }
+                if (!string.IsNullOrEmpty(matching.MatchingMaterial))
+                {
+                    visual.Material = matching.MatchingMaterial;
+                    result = true;
+                }
+                if (matching.MatchingDiameter.HasValue)
+                {
+                    visual.Diameter = matching.MatchingDiameter.Value;
+                    result = true;
+                }
+                if (matching.MatchingRoughness.HasValue)
+                {
+                    visual.Roughness = matching.MatchingRoughness.Value;
+                    result = true;
+                }
+                if (matching.MatchingMinorLoss.HasValue)
+                {
+                    visual.MinorLoss = matching.MatchingMinorLoss.Value;
+                    result = true;
+                }
+            }
+            return result;
+        }
+
+        #endregion
+
+        #region 杩囨浮浠�
+
+        /// <summary>
+        /// 搴旂敤
+        /// </summary>
+        public static bool Apply(HydroTranslationViewModel visualViewModel, HydroTranslationMatchingViewModel matching)
+        {
+            var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching);
+            visualViewModel.UpdateProperty();
+            return bol;
+        }
+
+        /// <summary>
+        /// 搴旂敤
+        /// </summary>
+        public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroTranslationInfo visual, HydroTranslationMatchingViewModel matching)
+        {
+            if (hydroInfo == null)
+            {
+                return false;
+            }
+            if (visual == null)
+            {
+                return false;
+            }
+            if (matching == null)
+            {
+                return false;
+            }
+
+            visual.Name = matching.Name;
+            visual.DbLocked = matching.DbLocked;
+            visual.DbId = matching.DbId;
+            visual.ModelType = matching.ModelType;
+            visual.Material = matching.Material;
+            visual.Diameter = matching.Diameter;
+            visual.StartDiameter = matching.StartDiameter;
+            visual.EndDiameter = matching.EndDiameter;
+            visual.Roughness = matching.Roughness;
+            visual.MinorLoss = matching.MinorLoss;
+
+            bool result = false;
+
+            if (!visual.DbLocked)
+            {
+                if (!string.IsNullOrEmpty(matching.MatchingModelType))
+                {
+                    visual.ModelType = matching.MatchingModelType;
+                    result = true;
+                }
+                if (!string.IsNullOrEmpty(matching.MatchingDbId))
+                {
+                    visual.DbId = matching.MatchingDbId;
+                    result = true;
+                }
+                if (!string.IsNullOrEmpty(matching.MatchingMaterial))
+                {
+                    visual.Material = matching.MatchingMaterial;
+                    result = true;
+                }
+                if (matching.MatchingDiameter.HasValue)
+                {
+                    visual.Diameter = matching.MatchingDiameter.Value;
+                    result = true;
+                }
+                if (matching.MatchingStartDiameter.HasValue)
+                {
+                    visual.StartDiameter = matching.MatchingStartDiameter.Value;
+                    result = true;
+                }
+                if (matching.MatchingEndDiameter.HasValue)
+                {
+                    visual.EndDiameter = matching.MatchingEndDiameter.Value;
+                    result = true;
+                }
+                if (matching.MatchingRoughness.HasValue)
+                {
+                    visual.Roughness = matching.MatchingRoughness.Value;
+                    result = true;
+                }
+                if (matching.MatchingMinorLoss.HasValue)
+                {
+                    visual.MinorLoss = matching.MatchingMinorLoss.Value;
+                    result = true;
+                }
+            }
+            return result;
+        }
+
+        #endregion
+
+        #region 姘存车
+
+        /// <summary>
+        /// 搴旂敤
+        /// </summary>
+        public static bool Apply(HydroPumpViewModel visualViewModel, HydroPumpMatchingViewModel matching)
+        {
+            var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching);
+            visualViewModel.UpdateProperty();
+            return bol;
+        }
+
+        /// <summary>
+        /// 搴旂敤
+        /// </summary>
+        public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroPumpInfo visual, HydroPumpMatchingViewModel matching)
+        {
+            if (hydroInfo == null)
+            {
+                return false;
+            }
+            if (visual == null)
+            {
+                return false;
+            }
+            if (matching == null)
+            {
+                return false;
+            }
+
+            visual.Name = matching.Name;
+            visual.DbLocked = matching.DbLocked;
+            visual.DbId = matching.DbId;
+            visual.ModelType = matching.ModelType;
+            visual.RatedQ = matching.RatedQ;
+            visual.RatedH = matching.RatedH;
+            visual.RatedP = matching.RatedP;
+            visual.RatedN = matching.RatedN;
+            visual.RatedHz = matching.RatedHz;
+            visual.SpeedRatio = matching.CurrentHz / visual.RatedHz;
+
+            bool result = false;
+            if (!visual.DbLocked)
+            {
+                if (!string.IsNullOrEmpty(matching.MatchingModelType))
+                {
+                    visual.UpdatePropStatus(nameof(visual.ModelType), ePropStatus.Matching, $"閫氳繃鍩虹鏁版嵁鍖归厤淇锛屽師濮嬫暟鎹�:{visual.ModelType}");
+                    visual.ModelType = matching.MatchingModelType;
+                    result = true;
+                }
+                if (!string.IsNullOrEmpty(matching.MatchingDbId))
+                {
+                    visual.UpdatePropStatus(nameof(visual.DbId), ePropStatus.Matching, $"閫氳繃鍩虹鏁版嵁鍖归厤淇锛屽師濮嬫暟鎹�:{visual.DbId}");
+                    visual.DbId = matching.MatchingDbId;
+                    result = true;
+                }
+                if (matching.MatchingRatedQ.HasValue)
+                {
+                    visual.UpdatePropStatus(nameof(visual.RatedQ), ePropStatus.Matching, $"閫氳繃鍩虹鏁版嵁鍖归厤淇锛屽師濮嬫暟鎹�:{visual.RatedQ}");
+                    visual.RatedQ = matching.MatchingRatedQ.Value;
+                    result = true;
+                }
+                if (matching.MatchingRatedH.HasValue)
+                {
+                    visual.UpdatePropStatus(nameof(visual.RatedH), ePropStatus.Matching, $"閫氳繃鍩虹鏁版嵁鍖归厤淇锛屽師濮嬫暟鎹�:{visual.RatedH}");
+                    visual.RatedH = matching.MatchingRatedH.Value;
+                    result = true;
+                }
+                if (matching.MatchingRatedP.HasValue)
+                {
+                    visual.UpdatePropStatus(nameof(visual.RatedP), ePropStatus.Matching, $"閫氳繃鍩虹鏁版嵁鍖归厤淇锛屽師濮嬫暟鎹�:{visual.RatedP}");
+                    visual.RatedP = matching.MatchingRatedP.Value;
+                    result = true;
+                }
+                if (matching.MatchingRatedN.HasValue)
+                {
+                    visual.UpdatePropStatus(nameof(visual.RatedN), ePropStatus.Matching, $"閫氳繃鍩虹鏁版嵁鍖归厤淇锛屽師濮嬫暟鎹�:{visual.RatedN}");
+                    visual.RatedN = matching.MatchingRatedN.Value;
+                    result = true;
+                }
+                if (matching.MatchingRatedHz.HasValue)
+                {
+                    visual.UpdatePropStatus(nameof(visual.RatedHz), ePropStatus.Matching, $"閫氳繃鍩虹鏁版嵁鍖归厤淇锛屽師濮嬫暟鎹�:{visual.RatedHz}");
+                    visual.RatedHz = matching.MatchingRatedHz.Value;
+                    result = true;
+                }
+                if (matching.MatchingCurrentHz.HasValue)
+                {
+                    visual.UpdatePropStatus(nameof(visual.SpeedRatio), ePropStatus.Matching, $"閫氳繃鍩虹鏁版嵁鍖归厤淇锛屽師濮嬫暟鎹�:{visual.SpeedRatio}");
+                    visual.SpeedRatio = matching.MatchingCurrentHz.Value / visual.RatedHz;
+                    result = true;
+                }
+
+                if (!string.IsNullOrEmpty(matching.MatchingCurveDbId))
+                {
+                    //娴侀噺鎵▼鏇茬嚎
+                    var curveqh = hydroInfo.Curves?.Find(x => x.Code == visual.CurveQH);
+                    if (curveqh == null)
+                    {
+                        curveqh = new Yw.Model.HydroCurveInfo();
+                        curveqh.Catalog = Yw.Hydro.ParterCatalog.Curve;
+                        curveqh.Code = Yw.Untity.UniqueHelper.CreateFromFirst("curve", hydroInfo.GetAllParterCodes());
+                        curveqh.Name = "鍖归厤";
+                        curveqh.ModelType = string.Empty;
+                        curveqh.DbLocked = false;
+                        curveqh.DbId = matching.MatchingCurveDbId;
+                        curveqh.CurveType = Yw.WinFrmUI.HydroCurve.PumpQH;
+                        curveqh.CurveData = matching.MatchingCurveQH?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
+                        if (hydroInfo.Curves == null)
+                        {
+                            hydroInfo.Curves = new List<Yw.Model.HydroCurveInfo>();
+                        }
+                        hydroInfo.Curves.Add(curveqh);
+                        visual.UpdatePropStatus(nameof(visual.CurveQH), ePropStatus.Matching, $"閫氳繃鍩虹鏁版嵁鍖归厤淇");
+                        visual.CurveQH = curveqh.Code;
+                        result = true;
+                    }
+                    else
+                    {
+                        if (!curveqh.DbLocked)
+                        {
+                            curveqh.DbId = matching.MatchingCurveDbId;
+                            curveqh.CurveData = matching.MatchingCurveQH?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
+                            result = true;
+                        }
+                    }
+
+                    //娴侀噺鍔熺巼鏇茬嚎
+                    var curveqp = hydroInfo.Curves?.Find(x => x.Code == visual.CurveQP);
+                    if (curveqp == null)
+                    {
+                        curveqp = new Yw.Model.HydroCurveInfo();
+                        curveqp.Catalog = Yw.Hydro.ParterCatalog.Curve;
+                        curveqp.Code = Yw.Untity.UniqueHelper.CreateFromFirst("curve", hydroInfo.GetAllParterCodes());
+                        curveqp.Name = "鍖归厤";
+                        curveqp.ModelType = string.Empty;
+                        curveqp.DbLocked = false;
+                        curveqp.DbId = matching.MatchingCurveDbId;
+                        curveqp.CurveType = Yw.WinFrmUI.HydroCurve.PumpQP;
+                        curveqp.CurveData = matching.MatchingCurveQP?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
+                        if (hydroInfo.Curves == null)
+                        {
+                            hydroInfo.Curves = new List<Yw.Model.HydroCurveInfo>();
+                        }
+                        hydroInfo.Curves.Add(curveqp);
+                        visual.UpdatePropStatus(nameof(visual.CurveQP), ePropStatus.Matching, $"閫氳繃鍩虹鏁版嵁鍖归厤淇");
+                        visual.CurveQP = curveqp.Code;
+                        result = true;
+                    }
+                    else
+                    {
+                        if (!curveqp.DbLocked)
+                        {
+                            curveqp.DbId = matching.MatchingCurveDbId;
+                            curveqp.CurveData = matching.MatchingCurveQP?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
+                            result = true;
+                        }
+                    }
+
+                    //娴侀噺鏁堢巼鏇茬嚎
+                    var curveqe = hydroInfo.Curves?.Find(x => x.Code == visual.CurveQE);
+                    if (curveqe == null)
+                    {
+                        curveqe = new Yw.Model.HydroCurveInfo();
+                        curveqe.Catalog = Yw.Hydro.ParterCatalog.Curve;
+                        curveqe.Code = Yw.Untity.UniqueHelper.CreateFromFirst("curve", hydroInfo.GetAllParterCodes());
+                        curveqe.Name = "鍖归厤";
+                        curveqe.ModelType = string.Empty;
+                        curveqe.DbLocked = false;
+                        curveqe.DbId = matching.MatchingCurveDbId;
+                        curveqe.CurveType = Yw.WinFrmUI.HydroCurve.PumpQE;
+                        curveqe.CurveData = matching.MatchingCurveQE?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
+                        if (hydroInfo.Curves == null)
+                        {
+                            hydroInfo.Curves = new List<Yw.Model.HydroCurveInfo>();
+                        }
+                        hydroInfo.Curves.Add(curveqe);
+                        visual.UpdatePropStatus(nameof(visual.CurveQE), ePropStatus.Matching, $"閫氳繃鍩虹鏁版嵁鍖归厤淇");
+                        visual.CurveQE = curveqe.Code;
+                        result = true;
+                    }
+                    else
+                    {
+                        if (!curveqe.DbLocked)
+                        {
+                            curveqe.DbId = matching.MatchingCurveDbId;
+                            curveqe.CurveData = matching.MatchingCurveQE?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
+                            result = true;
+                        }
+                    }
+                }
+            }
+
+            return result;
+        }
+
+        #endregion
+
+        #region 闃�闂�
+
+        /// <summary>
+        /// 搴旂敤
+        /// </summary>
+        public static bool Apply(HydroValveViewModel visualViewModel, HydroValveMatchingViewModel matching)
+        {
+            var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching);
+            visualViewModel.UpdateProperty();
+            return bol;
+        }
+
+        /// <summary>
+        /// 搴旂敤
+        /// </summary>
+        public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroValveInfo visual, HydroValveMatchingViewModel matching)
+        {
+            if (hydroInfo == null)
+            {
+                return false;
+            }
+            if (visual == null)
+            {
+                return false;
+            }
+            if (matching == null)
+            {
+                return false;
+            }
+
+            visual.Name = matching.Name;
+            visual.DbLocked = matching.DbLocked;
+            visual.DbId = matching.DbId;
+            visual.ModelType = matching.ModelType;
+            visual.Material = matching.Material;
+            visual.Diameter = matching.Diameter;
+            visual.MinorLoss = matching.MinorLoss;
+            visual.ValveType = HydroValveTypeEnumHelper.GetValveTypeCode(matching.ValveType);
+            visual.ValveSetting = matching.ValveSetting;
+
+            bool result = false;
+
+            if (!visual.DbLocked)
+            {
+                if (!string.IsNullOrEmpty(matching.MatchingModelType))
+                {
+                    visual.UpdatePropStatus(nameof(visual.ModelType), ePropStatus.Matching, "閫氳繃鍩虹鏁版嵁鍖归厤淇");
+                    visual.ModelType = matching.MatchingModelType;
+                    result = true;
+                }
+                if (!string.IsNullOrEmpty(matching.MatchingDbId))
+                {
+                    visual.UpdatePropStatus(nameof(visual.DbId), ePropStatus.Matching, "閫氳繃鍩虹鏁版嵁鍖归厤淇");
+                    visual.DbId = matching.MatchingDbId;
+                    result = true;
+                }
+                if (!string.IsNullOrEmpty(matching.MatchingMaterial))
+                {
+                    visual.UpdatePropStatus(nameof(visual.Material), ePropStatus.Matching, "閫氳繃鍩虹鏁版嵁鍖归厤淇");
+                    visual.Material = matching.MatchingMaterial;
+                    result = true;
+                }
+                if (matching.MatchingDiameter.HasValue)
+                {
+                    visual.UpdatePropStatus(nameof(visual.Diameter), ePropStatus.Matching, "閫氳繃鍩虹鏁版嵁鍖归厤淇");
+                    visual.Diameter = matching.MatchingDiameter.Value;
+                    result = true;
+                }
+                if (matching.MatchingMinorLoss.HasValue)
+                {
+                    visual.UpdatePropStatus(nameof(visual.MinorLoss), ePropStatus.Matching, "閫氳繃鍩虹鏁版嵁鍖归厤淇");
+                    visual.MinorLoss = matching.MatchingMinorLoss.Value;
+                    result = true;
+                }
+                if (matching.MatchingValveType.HasValue)
+                {
+                    visual.UpdatePropStatus(nameof(visual.ValveType), ePropStatus.Matching, "閫氳繃鍩虹鏁版嵁鍖归厤淇");
+                    visual.ValveType = HydroValveTypeEnumHelper.GetValveTypeCode(matching.MatchingValveType.Value);
+                    result = true;
+                }
+                switch (visual.ValveType)
+                {
+                    case Yw.Hydro.ValveType.PSV:
+                        {
+                            if (!string.IsNullOrEmpty(matching.MatchingValveSetting))
+                            {
+                                visual.UpdatePropStatus(nameof(visual.ValveSetting), ePropStatus.Matching, "閫氳繃鍩虹鏁版嵁鍖归厤淇");
+                                visual.ValveSetting = matching.MatchingValveSetting;
+                                result = true;
+                            }
+                        }
+                        break;
+                    case Yw.Hydro.ValveType.PBV:
+                        {
+                            if (!string.IsNullOrEmpty(matching.MatchingValveSetting))
+                            {
+                                visual.UpdatePropStatus(nameof(visual.ValveSetting), ePropStatus.Matching, "閫氳繃鍩虹鏁版嵁鍖归厤淇");
+                                visual.ValveSetting = matching.MatchingValveSetting;
+                                result = true;
+                            }
+                        }
+                        break;
+                    case Yw.Hydro.ValveType.PRV:
+                        {
+                            if (!string.IsNullOrEmpty(matching.MatchingValveSetting))
+                            {
+                                visual.UpdatePropStatus(nameof(visual.ValveSetting), ePropStatus.Matching, "閫氳繃鍩虹鏁版嵁鍖归厤淇");
+                                visual.ValveSetting = matching.MatchingValveSetting;
+                                result = true;
+                            }
+                        }
+                        break;
+                    case Yw.Hydro.ValveType.FCV:
+                        {
+                            if (!string.IsNullOrEmpty(matching.MatchingValveSetting))
+                            {
+                                visual.UpdatePropStatus(nameof(visual.ValveSetting), ePropStatus.Matching, "閫氳繃鍩虹鏁版嵁鍖归厤淇");
+                                visual.ValveSetting = matching.MatchingValveSetting;
+                                result = true;
+                            }
+                        }
+                        break;
+                    case Yw.Hydro.ValveType.TCV:
+                        {
+                            if (!string.IsNullOrEmpty(matching.MatchingCurveDbId))
+                            {
+                                //闃�闂ㄥ紑搴︽崯澶辩郴鏁版洸绾�
+                                var curveol = hydroInfo.Curves?.Find(x => x.Code == visual.ValveSetting);
+                                if (curveol == null)
+                                {
+                                    curveol = new Yw.Model.HydroCurveInfo();
+                                    curveol.Catalog = Yw.Hydro.ParterCatalog.Curve;
+                                    curveol.Code = Yw.Untity.UniqueHelper.CreateFromFirst("curve", hydroInfo.GetAllParterCodes());
+                                    curveol.Name = "鍖归厤";
+                                    curveol.ModelType = visual.ModelType;
+                                    curveol.DbLocked = false;
+                                    curveol.DbId = matching.MatchingCurveDbId;
+                                    curveol.CurveType = Yw.WinFrmUI.HydroCurve.ValveOL;
+                                    curveol.CurveData = matching.MatchingCurveOL?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
+                                    if (hydroInfo.Curves == null)
+                                    {
+                                        hydroInfo.Curves = new List<Yw.Model.HydroCurveInfo>();
+                                    }
+                                    hydroInfo.Curves.Add(curveol);
+                                    visual.ValveSetting = curveol.Code;
+                                    result = true;
+                                }
+                                else
+                                {
+                                    if (!curveol.DbLocked)
+                                    {
+                                        curveol.DbId = matching.MatchingCurveDbId;
+                                        curveol.CurveData = matching.MatchingCurveOL?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
+                                        result = true;
+                                    }
+                                }
+                            }
+                        }
+                        break;
+                    case Yw.Hydro.ValveType.GPV:
+                        {
+                            if (!string.IsNullOrEmpty(matching.MatchingCurveDbId))
+                            {
+                                //闃�闂ㄥ紑搴︽崯澶辩郴鏁版洸绾�
+                                var curveql = hydroInfo.Curves?.Find(x => x.Code == visual.ValveSetting);
+                                if (curveql == null)
+                                {
+                                    curveql = new Yw.Model.HydroCurveInfo();
+                                    curveql.Catalog = Yw.Hydro.ParterCatalog.Curve;
+                                    curveql.Code = Yw.Untity.UniqueHelper.CreateFromFirst("curve", hydroInfo.GetAllParterCodes());
+                                    curveql.Name = "鍖归厤";
+                                    curveql.ModelType = visual.ModelType;
+                                    curveql.DbLocked = false;
+                                    curveql.DbId = matching.MatchingCurveDbId;
+                                    curveql.CurveType = Yw.WinFrmUI.HydroCurve.ValveOL;
+                                    curveql.CurveData = matching.MatchingCurveQL?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
+                                    if (hydroInfo.Curves == null)
+                                    {
+                                        hydroInfo.Curves = new List<Yw.Model.HydroCurveInfo>();
+                                    }
+                                    hydroInfo.Curves.Add(curveql);
+                                    visual.ValveSetting = curveql.Code;
+                                    result = true;
+                                }
+                                else
+                                {
+                                    if (!curveql.DbLocked)
+                                    {
+                                        curveql.DbId = matching.MatchingCurveDbId;
+                                        curveql.CurveData = matching.MatchingCurveQL?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
+                                        result = true;
+                                    }
+                                }
+                            }
+                        }
+                        break;
+                    case Yw.Hydro.ValveType.CV:
+                        {
+
+                        }
+                        break;
+                }
+            }
+            return result;
+        }
+
+        #endregion
+
+        #region 鎹㈢儹鍣�
+
+        /// <summary>
+        /// 搴旂敤
+        /// </summary>
+        public static bool Apply(HydroExchangerViewModel visualViewModel, HydroExchangerMatchingViewModel matching)
+        {
+            var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching);
+            visualViewModel.UpdateProperty();
+            return bol;
+        }
+
+        /// <summary>
+        /// 搴旂敤
+        /// </summary>
+        public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroExchangerInfo visual, HydroExchangerMatchingViewModel matching)
+        {
+            if (hydroInfo == null)
+            {
+                return false;
+            }
+            if (visual == null)
+            {
+                return false;
+            }
+            if (matching == null)
+            {
+                return false;
+            }
+            visual.Name = matching.Name;
+            visual.DbLocked = matching.DbLocked;
+            visual.DbId = matching.DbId;
+            visual.ModelType = matching.ModelType;
+            visual.Material = matching.Material;
+            visual.Diameter = matching.Diameter;
+            visual.MinorLoss = matching.MinorLoss;
+
+            bool result = false;
+            if (!visual.DbLocked)
+            {
+                if (!string.IsNullOrEmpty(matching.MatchingModelType))
+                {
+                    visual.ModelType = matching.MatchingModelType;
+                    result = true;
+                }
+                if (!string.IsNullOrEmpty(matching.MatchingDbId))
+                {
+                    visual.DbId = matching.MatchingDbId;
+                    result = true;
+                }
+                if (!string.IsNullOrEmpty(matching.MatchingMaterial))
+                {
+                    visual.Material = matching.MatchingMaterial;
+                    result = true;
+                }
+                if (matching.MatchingDiameter.HasValue)
+                {
+                    visual.Diameter = matching.MatchingDiameter.Value;
+                    result = true;
+                }
+                if (matching.MatchingMinorLoss.HasValue)
+                {
+                    visual.MinorLoss = matching.MatchingMinorLoss.Value;
+                    result = true;
+                }
+
+                if (!string.IsNullOrEmpty(matching.MatchingCurveDbId))
+                {
+                    var curvevql = hydroInfo.Curves?.Find(x => x.Code == visual.CurveQL);
+                    if (curvevql == null)
+                    {
+                        curvevql = new Yw.Model.HydroCurveInfo();
+                        curvevql.Catalog = Yw.Hydro.ParterCatalog.Curve;
+                        curvevql.Code = Yw.Untity.UniqueHelper.CreateFromFirst("curve", hydroInfo.GetAllParterCodes());
+                        curvevql.Name = "鍖归厤";
+                        curvevql.ModelType = string.Empty;
+                        curvevql.DbLocked = false;
+                        curvevql.DbId = matching.MatchingCurveDbId;
+                        curvevql.CurveType = Yw.WinFrmUI.HydroCurve.ExchangerQL;
+                        curvevql.CurveData = matching.MatchingCurveQL?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
+                        if (hydroInfo.Curves == null)
+                        {
+                            hydroInfo.Curves = new List<Yw.Model.HydroCurveInfo>();
+                        }
+                        hydroInfo.Curves.Add(curvevql);
+                        visual.CurveQL = curvevql.Code;
+                        result = true;
+                    }
+                    else
+                    {
+                        if (!curvevql.DbLocked)
+                        {
+                            curvevql.DbId = matching.MatchingCurveDbId;
+                            curvevql.CurveData = matching.MatchingCurveQL?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
+                            result = true;
+                        }
+                    }
+                }
+            }
+            return result;
+        }
+
+        #endregion
+
+        #region 绌哄帇鏈�
+
+        /// <summary>
+        /// 搴旂敤
+        /// </summary>
+        public static bool Apply(HydroCompressorViewModel visualViewModel, HydroCompressorMatchingViewModel matching)
+        {
+            var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching);
+            visualViewModel.UpdateProperty();
+            return bol;
+        }
+
+        /// <summary>
+        /// 搴旂敤
+        /// </summary>
+        public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroCompressorInfo visual, HydroCompressorMatchingViewModel matching)
+        {
+            if (hydroInfo == null)
+            {
+                return false;
+            }
+            if (visual == null)
+            {
+                return false;
+            }
+            if (matching == null)
+            {
+                return false;
+            }
+            visual.Name = matching.Name;
+            visual.DbLocked = matching.DbLocked;
+            visual.DbId = matching.DbId;
+            visual.ModelType = matching.ModelType;
+            visual.Material = matching.Material;
+            visual.Diameter = matching.Diameter;
+            visual.MinorLoss = matching.MinorLoss;
+
+            bool result = false;
+            if (!visual.DbLocked)
+            {
+                if (!string.IsNullOrEmpty(matching.MatchingModelType))
+                {
+                    visual.ModelType = matching.MatchingModelType;
+                    visual.UpdatePropStatus(nameof(visual.ModelType), ePropStatus.Matching, "閫氳繃鍩虹鏁版嵁鍖归厤淇");
+                    result = true;
+                }
+                if (!string.IsNullOrEmpty(matching.MatchingDbId))
+                {
+                    visual.DbId = matching.MatchingDbId;
+                    visual.UpdatePropStatus(nameof(visual.DbId), ePropStatus.Matching, "閫氳繃鍩虹鏁版嵁鍖归厤淇");
+                    result = true;
+                }
+                if (!string.IsNullOrEmpty(matching.MatchingMaterial))
+                {
+                    visual.Material = matching.MatchingMaterial;
+                    visual.UpdatePropStatus(nameof(visual.Material), ePropStatus.Matching, "閫氳繃鍩虹鏁版嵁鍖归厤淇");
+                    result = true;
+                }
+                if (matching.MatchingDiameter.HasValue)
+                {
+                    visual.Diameter = matching.MatchingDiameter.Value;
+                    visual.UpdatePropStatus(nameof(visual.Diameter), ePropStatus.Matching, "閫氳繃鍩虹鏁版嵁鍖归厤淇");
+                    result = true;
+                }
+                if (matching.MatchingMinorLoss.HasValue)
+                {
+                    visual.MinorLoss = matching.MatchingMinorLoss.Value;
+                    visual.UpdatePropStatus(nameof(visual.MinorLoss), ePropStatus.Matching, "閫氳繃鍩虹鏁版嵁鍖归厤淇");
+                    result = true;
+                }
+
+                if (!string.IsNullOrEmpty(matching.MatchingCurveDbId))
+                {
+                    var curvevql = hydroInfo.Curves?.Find(x => x.Code == visual.CurveQL);
+                    if (curvevql == null)
+                    {
+                        curvevql = new Yw.Model.HydroCurveInfo();
+                        curvevql.Catalog = Yw.Hydro.ParterCatalog.Curve;
+                        curvevql.Code = Yw.Untity.UniqueHelper.CreateFromFirst("curve", hydroInfo.GetAllParterCodes());
+                        curvevql.Name = "鍖归厤";
+                        curvevql.ModelType = string.Empty;
+                        curvevql.DbLocked = false;
+                        curvevql.DbId = matching.MatchingCurveDbId;
+                        curvevql.CurveType = Yw.WinFrmUI.HydroCurve.CompressorQL;
+                        curvevql.CurveData = matching.MatchingCurveQL?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
+                        if (hydroInfo.Curves == null)
+                        {
+                            hydroInfo.Curves = new List<Yw.Model.HydroCurveInfo>();
+                        }
+                        hydroInfo.Curves.Add(curvevql);
+                        visual.CurveQL = curvevql.Code;
+                        result = true;
+                    }
+                    else
+                    {
+                        if (!curvevql.DbLocked)
+                        {
+                            curvevql.DbId = matching.MatchingCurveDbId;
+                            curvevql.CurveData = matching.MatchingCurveQL?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
+                            result = true;
+                        }
+                    }
+                }
+            }
+            return result;
+        }
+
+        #endregion
 
         #endregion
 

--
Gitblit v1.9.3