HStation/XHS.V1.0.git

			@@ -1,8 +1,4 @@
			using DevExpress.XtraSpreadsheet.Model.CopyOperation;
			using System.Windows.Media.Imaging;
			using Yw.DAL.Basic;
			using Yw.EPAnet;
			using Yw.Hydro;
			using Yw.Hydro;
			using Yw.Model;

			namespace Yw.WinFrmUI
			@@ -1030,9 +1026,15 @@
			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply(HydroTankViewModel visualViewModel, HydroTankMatchingViewModel matching)
			public static bool Apply
			(
			HydroTankViewModel visualViewModel,
			HydroTankMatchingViewModel matching,
			HydroChangeHelper changeHelper = null,
			HydroPropStatusHelper propStatusHelper = null
			)
			{
			var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching);
			var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching, changeHelper, propStatusHelper);
			visualViewModel.UpdateProperty();
			return bol;
			}
			@@ -1040,7 +1042,14 @@
			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroTankInfo visual, HydroTankMatchingViewModel matching)
			public static bool Apply
			(
			Yw.Model.HydroModelInfo hydroInfo,
			Yw.Model.HydroTankInfo visual,
			HydroTankMatchingViewModel matching,
			HydroChangeHelper changeHelper = null,
			HydroPropStatusHelper propStatusHelper = null
			)
			{
			if (hydroInfo == null)
			{
			@@ -1054,58 +1063,86 @@
			{
			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;
			//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, "通过基础数据匹配修复");
			if (visual.ModelType != matching.MatchingModelType)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.ModelType), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.ModelType = matching.MatchingModelType;
			result = true;
			}
			if (!string.IsNullOrEmpty(matching.MatchingDbId))
			{
			visual.UpdatePropStatus(nameof(visual.DbId), ePropStatus.Matching, "通过基础数据匹配修复");
			if (visual.DbId != matching.MatchingDbId)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.DbId), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.DbId = matching.MatchingDbId;
			result = true;
			}
			if (matching.MatchingMinLevel.HasValue)
			{
			visual.UpdatePropStatus(nameof(visual.MinLevel), ePropStatus.Matching, "通过基础数据匹配修复");
			if (visual.MinLevel != matching.MatchingMinLevel.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.MinLevel), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.MinLevel = matching.MatchingMinLevel.Value;
			result = true;
			}
			if (matching.MatchingMaxLevel.HasValue)
			{
			visual.UpdatePropStatus(nameof(visual.MaxLevel), ePropStatus.Matching, "通过基础数据匹配修复");
			if (visual.MaxLevel != matching.MatchingMaxLevel.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.MaxLevel), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.MaxLevel = matching.MatchingMaxLevel.Value;
			result = true;
			}
			if (matching.MatchingDN.HasValue)
			{
			visual.UpdatePropStatus(nameof(visual.DN), ePropStatus.Matching, "通过基础数据匹配修复");
			if (visual.DN != matching.MatchingDN.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.DN), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.DN = matching.MatchingDN.Value;
			result = true;
			}
			if (matching.MatchingMinVol.HasValue)
			{
			visual.UpdatePropStatus(nameof(visual.MinVol), ePropStatus.Matching, "通过基础数据匹配修复");
			if (visual.MinVol != matching.MatchingMinVol.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.MinVol), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.MinVol = matching.MatchingMinVol.Value;
			result = true;
			}
			if (matching.MatchingOverFlow.HasValue)
			{
			visual.UpdatePropStatus(nameof(visual.OverFlow), ePropStatus.Matching, "通过基础数据匹配修复");
			if (visual.OverFlow != matching.MatchingOverFlow.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.OverFlow), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.OverFlow = matching.MatchingOverFlow.Value;
			result = true;
			}
			@@ -1129,6 +1166,7 @@
			}
			hydroInfo.Curves.Add(curvevol);
			visual.VolCurve = curvevol.Code;
			changeHelper?.Append(curvevol, eChangeType.Add);
			result = true;
			}
			else
			@@ -1137,7 +1175,22 @@
			{
			curvevol.DbId = matching.MatchingCurveDbId;
			curvevol.CurveData = matching.MatchingVolCurve?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
			changeHelper?.Append(curvevol, eChangeType.Update);
			result = true;
			}
			}
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.VolCurve), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修复");
			}
			else
			{
			if (!string.IsNullOrEmpty(visual.VolCurve))
			{
			var volCurve = hydroInfo?.Curves?.Find(x => x.Code == visual.VolCurve);
			if (volCurve != null)
			{
			hydroInfo.Curves?.RemoveAll(x => x.Code == visual.VolCurve);
			visual.VolCurve = string.Empty;
			changeHelper?.Append(volCurve, eChangeType.Remove);
			}
			}
			}
			@@ -1152,9 +1205,15 @@
			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply(HydroBluntheadViewModel visualViewModel, HydroBluntheadMatchingViewModel matching)
			public static bool Apply
			(
			HydroBluntheadViewModel visualViewModel,
			HydroBluntheadMatchingViewModel matching,
			HydroChangeHelper changeHelper = null,
			HydroPropStatusHelper propStatusHelper = null
			)
			{
			var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching);
			var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching, changeHelper, propStatusHelper);
			visualViewModel.UpdateProperty();
			return bol;
			}
			@@ -1162,7 +1221,14 @@
			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroBluntheadInfo visual, HydroBluntheadMatchingViewModel matching)
			public static bool Apply
			(
			Yw.Model.HydroModelInfo hydroInfo,
			Yw.Model.HydroBluntheadInfo visual,
			HydroBluntheadMatchingViewModel matching,
			HydroChangeHelper changeHelper = null,
			HydroPropStatusHelper propStatusHelper = null
			)
			{
			if (hydroInfo == null)
			{
			@@ -1176,39 +1242,64 @@
			{
			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.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))
			{
			if (visual.ModelType != matching.MatchingModelType)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.ModelType), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.ModelType = matching.MatchingModelType;
			result = true;
			}
			if (!string.IsNullOrEmpty(matching.MatchingDbId))
			{
			if (visual.DbId != matching.MatchingDbId)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.DbId), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.DbId = matching.MatchingDbId;
			result = true;
			}
			if (matching.MatchingCaliber.HasValue)
			{
			if (visual.Caliber != matching.MatchingCaliber.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.Caliber), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.Caliber = matching.MatchingCaliber.Value;
			result = true;
			}
			if (!string.IsNullOrEmpty(matching.MatchingMaterial))
			{
			if (visual.Material != matching.MatchingMaterial)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.Material), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.Material = matching.MatchingMaterial;
			result = true;
			}
			if (matching.MatchingMinorLoss.HasValue)
			{
			if (visual.MinorLoss != matching.MatchingMinorLoss.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.MinorLoss), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.MinorLoss = matching.MatchingMinorLoss.Value;
			result = true;
			}
			@@ -1223,9 +1314,15 @@
			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply(HydroElbowViewModel visualViewModel, HydroElbowMatchingViewModel matching)
			public static bool Apply
			(
			HydroElbowViewModel visualViewModel,
			HydroElbowMatchingViewModel matching,
			HydroChangeHelper changeHelper = null,
			HydroPropStatusHelper propStatusHelper = null
			)
			{
			var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching);
			var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching, changeHelper, propStatusHelper);
			visualViewModel.UpdateProperty();
			return bol;
			}
			@@ -1233,7 +1330,14 @@
			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroElbowInfo visual, HydroElbowMatchingViewModel matching)
			public static bool Apply
			(
			Yw.Model.HydroModelInfo hydroInfo,
			Yw.Model.HydroElbowInfo visual,
			HydroElbowMatchingViewModel matching,
			HydroChangeHelper changeHelper = null,
			HydroPropStatusHelper propStatusHelper = null
			)
			{
			if (hydroInfo == null)
			{
			@@ -1247,55 +1351,91 @@
			{
			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);
			}
			//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))
			{
			if (visual.ModelType != matching.MatchingModelType)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.ModelType), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.ModelType = matching.MatchingModelType;
			result = true;
			}
			if (!string.IsNullOrEmpty(matching.MatchingDbId))
			{
			if (visual.DbId != matching.MatchingDbId)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.DbId), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.DbId = matching.MatchingDbId;
			result = true;
			}
			if (matching.MatchingCaliber.HasValue)
			{
			if (visual.Caliber != matching.MatchingCaliber.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.Caliber), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.Caliber = matching.MatchingCaliber.Value;
			result = true;
			}
			if (!string.IsNullOrEmpty(matching.MatchingMaterial))
			{
			if (visual.Material != matching.MatchingMaterial)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.Material), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.Material = matching.MatchingMaterial;
			result = true;
			}
			if (matching.MatchingMinorLoss.HasValue)
			{
			if (visual.MinorLoss != matching.MatchingMinorLoss.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.MinorLoss), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.MinorLoss = matching.MatchingMinorLoss.Value;
			result = true;
			}
			if (matching.MatchingBendingAngle.HasValue)
			{
			if (visual.BendingAngle != matching.MatchingBendingAngle.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.BendingAngle), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.BendingAngle = matching.MatchingBendingAngle.Value;
			result = true;
			}
			if (matching.MatchingElbowType.HasValue)
			{
			visual.ElbowType = HydroElbowTypeEnumHelper.GetElbowTypeName(matching.MatchingElbowType.Value);
			var elbowType = HydroElbowTypeEnumHelper.GetElbowTypeName(matching.MatchingElbowType.Value);
			if (visual.ElbowType != elbowType)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.ElbowType), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.ElbowType = elbowType;
			result = true;
			}
			}
			@@ -1309,9 +1449,15 @@
			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply(HydroThreelinkViewModel visualViewModel, HydroThreelinkMatchingViewModel matching)
			public static bool Apply
			(
			HydroThreelinkViewModel visualViewModel,
			HydroThreelinkMatchingViewModel matching,
			HydroChangeHelper changeHelper,
			HydroPropStatusHelper propStatusHelper
			)
			{
			var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching);
			var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching, changeHelper, propStatusHelper);
			visualViewModel.UpdateProperty();
			return bol;
			}
			@@ -1319,7 +1465,14 @@
			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroThreelinkInfo visual, HydroThreelinkMatchingViewModel matching)
			public static bool Apply
			(
			Yw.Model.HydroModelInfo hydroInfo,
			Yw.Model.HydroThreelinkInfo visual,
			HydroThreelinkMatchingViewModel matching,
			HydroChangeHelper changeHelper = null,
			HydroPropStatusHelper propStatusHelper = null
			)
			{
			if (hydroInfo == null)
			{
			@@ -1333,51 +1486,86 @@
			{
			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;
			//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))
			{
			if (visual.ModelType != matching.MatchingModelType)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.ModelType), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.ModelType = matching.MatchingModelType;
			result = true;
			}
			if (!string.IsNullOrEmpty(matching.MatchingDbId))
			{
			if (visual.DbId != matching.MatchingDbId)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.DbId), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.DbId = matching.MatchingDbId;
			result = true;
			}
			if (matching.MatchingCaliber.HasValue)
			{
			if (visual.Caliber != matching.MatchingCaliber.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.Caliber), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.Caliber = matching.MatchingCaliber.Value;
			result = true;
			}
			if (!string.IsNullOrEmpty(matching.MatchingMaterial))
			{
			if (visual.Material != matching.MatchingMaterial)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.Material), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.Material = matching.MatchingMaterial;
			result = true;
			}
			if (matching.MatchingMinorLoss.HasValue)
			{
			if (visual.MinorLoss != matching.MatchingMinorLoss.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.MinorLoss), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.MinorLoss = matching.MatchingMinorLoss.Value;
			result = true;
			}
			if (matching.MatchingRunningThroughLoss.HasValue)
			{
			if (visual.RunningThroughLoss != matching.MatchingRunningThroughLoss.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.RunningThroughLoss), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.RunningThroughLoss = matching.MatchingRunningThroughLoss.Value;
			result = true;
			}
			if (matching.MatchingBranchThroughLoss.HasValue)
			{
			if (visual.BranchThroughLoss != matching.MatchingBranchThroughLoss.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.BranchThroughLoss), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.BranchThroughLoss = matching.MatchingBranchThroughLoss.Value;
			result = true;
			}
			@@ -1392,9 +1580,15 @@
			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply(HydroFourlinkViewModel visualViewModel, HydroFourlinkMatchingViewModel matching)
			public static bool Apply
			(
			HydroFourlinkViewModel visualViewModel,
			HydroFourlinkMatchingViewModel matching,
			HydroChangeHelper changeHelper = null,
			HydroPropStatusHelper propStatusHelper = null
			)
			{
			var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching);
			var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching, changeHelper, propStatusHelper);
			visualViewModel.UpdateProperty();
			return bol;
			}
			@@ -1402,7 +1596,14 @@
			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroFourlinkInfo visual, HydroFourlinkMatchingViewModel matching)
			public static bool Apply
			(
			Yw.Model.HydroModelInfo hydroInfo,
			Yw.Model.HydroFourlinkInfo visual,
			HydroFourlinkMatchingViewModel matching,
			HydroChangeHelper changeHelper = null,
			HydroPropStatusHelper propStatusHelper = null
			)
			{
			if (hydroInfo == null)
			{
			@@ -1416,39 +1617,64 @@
			{
			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.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))
			{
			if (visual.ModelType != matching.MatchingModelType)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.ModelType), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.ModelType = matching.MatchingModelType;
			result = true;
			}
			if (!string.IsNullOrEmpty(matching.MatchingDbId))
			{
			if (visual.DbId != matching.MatchingDbId)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.DbId), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.DbId = matching.MatchingDbId;
			result = true;
			}
			if (matching.MatchingCaliber.HasValue)
			{
			if (visual.Caliber != matching.MatchingCaliber.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.Caliber), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.Caliber = matching.MatchingCaliber.Value;
			result = true;
			}
			if (!string.IsNullOrEmpty(matching.MatchingMaterial))
			{
			if (visual.Material != matching.MatchingMaterial)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.Material), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.Material = matching.MatchingMaterial;
			result = true;
			}
			if (matching.MatchingMinorLoss.HasValue)
			{
			if (visual.MinorLoss != matching.MatchingMinorLoss.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.MinorLoss), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.MinorLoss = matching.MatchingMinorLoss.Value;
			result = true;
			}
			@@ -1463,9 +1689,15 @@
			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply(HydroNozzleViewModel visualViewModel, HydroNozzleMatchingViewModel matching)
			public static bool Apply
			(
			HydroNozzleViewModel visualViewModel,
			HydroNozzleMatchingViewModel matching,
			HydroChangeHelper changeHelper = null,
			HydroPropStatusHelper propStatusHelper = null
			)
			{
			var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching);
			var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching, changeHelper, propStatusHelper);
			visualViewModel.UpdateProperty();
			return bol;
			}
			@@ -1473,7 +1705,14 @@
			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroNozzleInfo visual, HydroNozzleMatchingViewModel matching)
			public static bool Apply
			(
			Yw.Model.HydroModelInfo hydroInfo,
			Yw.Model.HydroNozzleInfo visual,
			HydroNozzleMatchingViewModel matching,
			HydroChangeHelper changeHelper = null,
			HydroPropStatusHelper propStatusHelper = null
			)
			{
			if (hydroInfo == null)
			{
			@@ -1487,45 +1726,75 @@
			{
			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;
			//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))
			{
			if (visual.ModelType != matching.MatchingModelType)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.ModelType), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.ModelType = matching.MatchingModelType;
			result = true;
			}
			if (!string.IsNullOrEmpty(matching.MatchingDbId))
			{
			if (visual.DbId != matching.MatchingDbId)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.DbId), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.DbId = matching.MatchingDbId;
			result = true;
			}
			if (matching.MatchingCaliber.HasValue)
			{
			if (visual.Caliber != matching.MatchingCaliber.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.Caliber), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.Caliber = matching.MatchingCaliber.Value;
			result = true;
			}
			if (!string.IsNullOrEmpty(matching.MatchingMaterial))
			{
			if (visual.Material != matching.MatchingMaterial)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.Material), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.Material = matching.MatchingMaterial;
			result = true;
			}
			if (matching.MatchingMinorLoss.HasValue)
			{
			if (visual.MinorLoss != matching.MatchingMinorLoss.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.MinorLoss), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.MinorLoss = matching.MatchingMinorLoss.Value;
			result = true;
			}
			if (matching.MatchingCoefficient.HasValue)
			{
			if (visual.Coefficient != matching.MatchingCoefficient.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.Coefficient), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.Coefficient = matching.MatchingCoefficient.Value;
			result = true;
			}
			@@ -1540,9 +1809,15 @@
			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply(HydroHydrantViewModel visualViewModel, HydroHydrantMatchingViewModel matching)
			public static bool Apply
			(
			HydroHydrantViewModel visualViewModel,
			HydroHydrantMatchingViewModel matching,
			HydroChangeHelper changeHelper = null,
			HydroPropStatusHelper propStatusHelper = null
			)
			{
			var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching);
			var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching, changeHelper, propStatusHelper);
			visualViewModel.UpdateProperty();
			return bol;
			}
			@@ -1550,7 +1825,14 @@
			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroHydrantInfo visual, HydroHydrantMatchingViewModel matching)
			public static bool Apply
			(
			Yw.Model.HydroModelInfo hydroInfo,
			Yw.Model.HydroHydrantInfo visual,
			HydroHydrantMatchingViewModel matching,
			HydroChangeHelper changeHelper = null,
			HydroPropStatusHelper propStatusHelper = null
			)
			{
			if (hydroInfo == null)
			{
			@@ -1564,45 +1846,75 @@
			{
			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;
			//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))
			{
			if (visual.ModelType != matching.MatchingModelType)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.ModelType), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.ModelType = matching.MatchingModelType;
			result = true;
			}
			if (!string.IsNullOrEmpty(matching.MatchingDbId))
			{
			if (visual.DbId != matching.MatchingDbId)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.DbId), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.DbId = matching.MatchingDbId;
			result = true;
			}
			if (matching.MatchingCaliber.HasValue)
			{
			if (visual.Caliber != matching.MatchingCaliber.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.Caliber), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.Caliber = matching.MatchingCaliber.Value;
			result = true;
			}
			if (!string.IsNullOrEmpty(matching.MatchingMaterial))
			{
			if (visual.Material != matching.MatchingMaterial)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.Material), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.Material = matching.MatchingMaterial;
			result = true;
			}
			if (matching.MatchingMinorLoss.HasValue)
			{
			if (visual.MinorLoss != matching.MatchingMinorLoss.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.MinorLoss), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.MinorLoss = matching.MatchingMinorLoss.Value;
			result = true;
			}
			if (matching.MatchingCoefficient.HasValue)
			{
			if (visual.Coefficient != matching.MatchingCoefficient.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.Coefficient), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.Coefficient = matching.MatchingCoefficient.Value;
			result = true;
			}
			@@ -1617,9 +1929,15 @@
			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply(HydroCoolingViewModel visualViewModel, HydroCoolingMatchingViewModel matching)
			public static bool Apply
			(
			HydroCoolingViewModel visualViewModel,
			HydroCoolingMatchingViewModel matching,
			HydroChangeHelper changeHelper = null,
			HydroPropStatusHelper propStatusHelper = null
			)
			{
			var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching);
			var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching, changeHelper, propStatusHelper);
			visualViewModel.UpdateProperty();
			return bol;
			}
			@@ -1627,7 +1945,14 @@
			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroCoolingInfo visual, HydroCoolingMatchingViewModel matching)
			public static bool Apply
			(
			Yw.Model.HydroModelInfo hydroInfo,
			Yw.Model.HydroCoolingInfo visual,
			HydroCoolingMatchingViewModel matching,
			HydroChangeHelper changeHelper = null,
			HydroPropStatusHelper propStatusHelper = null
			)
			{
			if (hydroInfo == null)
			{
			@@ -1641,58 +1966,86 @@
			{
			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;
			visual.LowerLimit = matching.LowerLimit;
			//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;
			//visual.LowerLimit = matching.LowerLimit;

			bool result = false;
			if (!visual.DbLocked)
			{
			if (!string.IsNullOrEmpty(matching.MatchingModelType))
			{
			visual.UpdatePropStatus(nameof(visual.ModelType), ePropStatus.Matching, $"通过基础数据匹配修复，原数据:{visual.ModelType}");
			if (visual.ModelType != matching.MatchingModelType)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.ModelType), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.ModelType = matching.MatchingModelType;
			result = true;
			}
			if (!string.IsNullOrEmpty(matching.MatchingDbId))
			{
			visual.UpdatePropStatus(nameof(visual.DbId), ePropStatus.Matching, $"通过基础数据匹配修复，原数据:{visual.DbId}");
			if (visual.DbId != matching.MatchingDbId)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.DbId), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.DbId = matching.MatchingDbId;
			result = true;
			}
			if (matching.MatchingCaliber.HasValue)
			{
			visual.UpdatePropStatus(nameof(visual.Caliber), ePropStatus.Matching, $"通过基础数据匹配修复，原数据:{visual.Caliber}");
			if (visual.Caliber != matching.MatchingCaliber.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.Caliber), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.Caliber = matching.MatchingCaliber.Value;
			result = true;
			}
			if (!string.IsNullOrEmpty(matching.MatchingMaterial))
			{
			visual.UpdatePropStatus(nameof(visual.Material), ePropStatus.Matching, $"通过基础数据匹配修复，原数据:{visual.Material}");
			if (visual.Material != matching.MatchingMaterial)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.Material), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.Material = matching.MatchingMaterial;
			result = true;
			}
			if (matching.MatchingMinorLoss.HasValue)
			{
			visual.UpdatePropStatus(nameof(visual.MinorLoss), ePropStatus.Matching, $"通过基础数据匹配修复，原数据:{visual.MinorLoss}");
			if (visual.MinorLoss != matching.MatchingMinorLoss.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.MinorLoss), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.MinorLoss = matching.MatchingMinorLoss.Value;
			result = true;
			}
			if (matching.MatchingCoefficient.HasValue)
			{
			visual.UpdatePropStatus(nameof(visual.Coefficient), ePropStatus.Matching, $"通过基础数据匹配修复，原数据:{visual.Coefficient}");
			if (visual.Coefficient != matching.MatchingCoefficient.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.Coefficient), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.Coefficient = matching.MatchingCoefficient.Value;
			result = true;
			}
			if (matching.MatchingLowerLimit.HasValue)
			{
			visual.UpdatePropStatus(nameof(visual.LowerLimit), ePropStatus.Matching, $"通过基础数据匹配修复，原数据:{visual.LowerLimit}");
			if (visual.LowerLimit != matching.MatchingLowerLimit.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.LowerLimit), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.LowerLimit = matching.MatchingLowerLimit.Value;
			result = true;
			}
			@@ -1707,9 +2060,15 @@
			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply(HydroMeterViewModel visualViewModel, HydroMeterMatchingViewModel matching)
			public static bool Apply
			(
			HydroMeterViewModel visualViewModel,
			HydroMeterMatchingViewModel matching,
			HydroChangeHelper changeHelper = null,
			HydroPropStatusHelper propStatusHelper = null
			)
			{
			var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching);
			var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching, changeHelper, propStatusHelper);
			visualViewModel.UpdateProperty();
			return bol;
			}
			@@ -1717,7 +2076,14 @@
			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroMeterInfo visual, HydroMeterMatchingViewModel matching)
			public static bool Apply
			(
			Yw.Model.HydroModelInfo hydroInfo,
			Yw.Model.HydroMeterInfo visual,
			HydroMeterMatchingViewModel matching,
			HydroChangeHelper changeHelper = null,
			HydroPropStatusHelper propStatusHelper = null
			)
			{
			if (hydroInfo == null)
			{
			@@ -1731,27 +2097,42 @@
			{
			return false;
			}
			visual.Name = matching.Name;
			visual.DbLocked = matching.DbLocked;
			visual.DbId = matching.DbId;
			visual.ModelType = matching.ModelType;
			visual.MinorLoss = matching.MinorLoss;
			//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))
			{
			if (visual.ModelType != matching.MatchingModelType)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.ModelType), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.ModelType = matching.MatchingModelType;
			result = true;
			}
			if (!string.IsNullOrEmpty(matching.MatchingDbId))
			{
			if (visual.DbId != matching.MatchingDbId)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.DbId), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.DbId = matching.MatchingDbId;
			result = true;
			}
			if (matching.MatchingMinorLoss.HasValue)
			{
			if (visual.MinorLoss != matching.MatchingMinorLoss.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.MinorLoss), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.MinorLoss = matching.MatchingMinorLoss.Value;
			result = true;
			}
			@@ -1766,9 +2147,15 @@
			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply(HydroFlowmeterViewModel visualViewModel, HydroFlowmeterMatchingViewModel matching)
			public static bool Apply
			(
			HydroFlowmeterViewModel visualViewModel,
			HydroFlowmeterMatchingViewModel matching,
			HydroChangeHelper changeHelper = null,
			HydroPropStatusHelper propStatusHelper = null
			)
			{
			var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching);
			var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching, changeHelper, propStatusHelper);
			visualViewModel.UpdateProperty();
			return bol;
			}
			@@ -1776,7 +2163,14 @@
			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroFlowmeterInfo visual, HydroFlowmeterMatchingViewModel matching)
			public static bool Apply
			(
			Yw.Model.HydroModelInfo hydroInfo,
			Yw.Model.HydroFlowmeterInfo visual,
			HydroFlowmeterMatchingViewModel matching,
			HydroChangeHelper changeHelper = null,
			HydroPropStatusHelper propStatusHelper = null
			)
			{
			if (hydroInfo == null)
			{
			@@ -1790,27 +2184,42 @@
			{
			return false;
			}
			visual.Name = matching.Name;
			visual.DbLocked = matching.DbLocked;
			visual.DbId = matching.DbId;
			visual.ModelType = matching.ModelType;
			visual.MinorLoss = matching.MinorLoss;
			//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))
			{
			if (visual.ModelType != matching.MatchingModelType)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.ModelType), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.ModelType = matching.MatchingModelType;
			result = true;
			}
			if (!string.IsNullOrEmpty(matching.MatchingDbId))
			{
			if (visual.DbId != matching.MatchingDbId)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.DbId), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.DbId = matching.MatchingDbId;
			result = true;
			}
			if (matching.MatchingMinorLoss.HasValue)
			{
			if (visual.MinorLoss != matching.MatchingMinorLoss.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.MinorLoss), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.MinorLoss = matching.MatchingMinorLoss.Value;
			result = true;
			}
			@@ -1825,9 +2234,15 @@
			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply(HydroPressmeterViewModel visualViewModel, HydroPressmeterMatchingViewModel matching)
			public static bool Apply
			(
			HydroPressmeterViewModel visualViewModel,
			HydroPressmeterMatchingViewModel matching,
			HydroChangeHelper changeHelper = null,
			HydroPropStatusHelper propStatusHelper = null
			)
			{
			var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching);
			var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching, changeHelper, propStatusHelper);
			visualViewModel.UpdateProperty();
			return bol;
			}
			@@ -1835,7 +2250,14 @@
			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroPressmeterInfo visual, HydroPressmeterMatchingViewModel matching)
			public static bool Apply
			(
			Yw.Model.HydroModelInfo hydroInfo,
			Yw.Model.HydroPressmeterInfo visual,
			HydroPressmeterMatchingViewModel matching,
			HydroChangeHelper changeHelper = null,
			HydroPropStatusHelper propStatusHelper = null
			)
			{
			if (hydroInfo == null)
			{
			@@ -1849,27 +2271,42 @@
			{
			return false;
			}
			visual.Name = matching.Name;
			visual.DbLocked = matching.DbLocked;
			visual.DbId = matching.DbId;
			visual.ModelType = matching.ModelType;
			visual.MinorLoss = matching.MinorLoss;
			//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))
			{
			if (visual.ModelType != matching.MatchingModelType)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.ModelType), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.ModelType = matching.MatchingModelType;
			result = true;
			}
			if (!string.IsNullOrEmpty(matching.MatchingDbId))
			{
			if (visual.DbId != matching.MatchingDbId)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.DbId), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.DbId = matching.MatchingDbId;
			result = true;
			}
			if (matching.MatchingMinorLoss.HasValue)
			{
			if (visual.MinorLoss != matching.MatchingMinorLoss.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.MinorLoss), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.MinorLoss = matching.MatchingMinorLoss.Value;
			result = true;
			}
			@@ -1884,9 +2321,15 @@
			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply(HydroPipeViewModel visualViewModel, HydroPipeMatchingViewModel matching)
			public static bool Apply
			(
			HydroPipeViewModel visualViewModel,
			HydroPipeMatchingViewModel matching,
			HydroChangeHelper changeHelper = null,
			HydroPropStatusHelper propStatusHelper = null
			)
			{
			var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching);
			var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching, changeHelper, propStatusHelper);
			visualViewModel.UpdateProperty();
			return bol;
			}
			@@ -1894,7 +2337,14 @@
			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroPipeInfo visual, HydroPipeMatchingViewModel matching)
			public static bool Apply
			(
			Yw.Model.HydroModelInfo hydroInfo,
			Yw.Model.HydroPipeInfo visual,
			HydroPipeMatchingViewModel matching,
			HydroChangeHelper changeHelper = null,
			HydroPropStatusHelper propStatusHelper = null
			)
			{
			if (hydroInfo == null)
			{
			@@ -1909,14 +2359,14 @@
			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;
			//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;

			@@ -1924,31 +2374,61 @@
			{
			if (!string.IsNullOrEmpty(matching.MatchingModelType))
			{
			if (visual.ModelType != matching.MatchingModelType)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.ModelType), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.ModelType = matching.MatchingModelType;
			result = true;
			}
			if (!string.IsNullOrEmpty(matching.MatchingDbId))
			{
			if (visual.DbId != matching.MatchingDbId)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.DbId), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.DbId = matching.MatchingDbId;
			result = true;
			}
			if (!string.IsNullOrEmpty(matching.MatchingMaterial))
			{
			if (visual.Material != matching.MatchingMaterial)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.Material), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.Material = matching.MatchingMaterial;
			result = true;
			}
			if (matching.MatchingDiameter.HasValue)
			{
			if (visual.Diameter != matching.MatchingDiameter.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.Diameter), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.Diameter = matching.MatchingDiameter.Value;
			result = true;
			}
			if (matching.MatchingRoughness.HasValue)
			{
			if (visual.Roughness != matching.MatchingRoughness.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.Roughness), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.Roughness = matching.MatchingRoughness.Value;
			result = true;
			}
			if (matching.MatchingMinorLoss.HasValue)
			{
			if (visual.MinorLoss != matching.MatchingMinorLoss.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.MinorLoss), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.MinorLoss = matching.MatchingMinorLoss.Value;
			result = true;
			}
			@@ -1963,9 +2443,15 @@
			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply(HydroTranslationViewModel visualViewModel, HydroTranslationMatchingViewModel matching)
			public static bool Apply
			(
			HydroTranslationViewModel visualViewModel,
			HydroTranslationMatchingViewModel matching,
			HydroChangeHelper changeHelper = null,
			HydroPropStatusHelper propStatusHelper = null
			)
			{
			var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching);
			var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching, changeHelper, propStatusHelper);
			visualViewModel.UpdateProperty();
			return bol;
			}
			@@ -1973,7 +2459,14 @@
			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroTranslationInfo visual, HydroTranslationMatchingViewModel matching)
			public static bool Apply
			(
			Yw.Model.HydroModelInfo hydroInfo,
			Yw.Model.HydroTranslationInfo visual,
			HydroTranslationMatchingViewModel matching,
			HydroChangeHelper changeHelper = null,
			HydroPropStatusHelper propStatusHelper = null
			)
			{
			if (hydroInfo == null)
			{
			@@ -1988,16 +2481,16 @@
			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;
			//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;

			@@ -2005,42 +2498,82 @@
			{
			if (!string.IsNullOrEmpty(matching.MatchingModelType))
			{
			if (visual.ModelType != matching.MatchingModelType)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.ModelType), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.ModelType = matching.MatchingModelType;
			result = true;
			}
			if (!string.IsNullOrEmpty(matching.MatchingDbId))
			{
			if (visual.DbId != matching.MatchingDbId)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.DbId), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.DbId = matching.MatchingDbId;
			result = true;
			}
			if (!string.IsNullOrEmpty(matching.MatchingMaterial))
			{
			if (visual.Material != matching.MatchingMaterial)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.Material), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.Material = matching.MatchingMaterial;
			result = true;
			}
			if (matching.MatchingDiameter.HasValue)
			{
			if (visual.Diameter != matching.MatchingDiameter.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.Diameter), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			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)
			{
			if (visual.Roughness != matching.MatchingRoughness.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.Roughness), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.Roughness = matching.MatchingRoughness.Value;
			result = true;
			}
			if (matching.MatchingMinorLoss.HasValue)
			{
			if (visual.MinorLoss != matching.MatchingMinorLoss.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.MinorLoss), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.MinorLoss = matching.MatchingMinorLoss.Value;
			result = true;
			}
			if (matching.MatchingStartDiameter.HasValue)
			{
			if (visual.StartDiameter != matching.MatchingStartDiameter.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.StartDiameter), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.StartDiameter = matching.MatchingStartDiameter.Value;
			result = true;
			}
			if (matching.MatchingEndDiameter.HasValue)
			{
			if (visual.EndDiameter != matching.MatchingEndDiameter.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.EndDiameter), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.EndDiameter = matching.MatchingEndDiameter.Value;
			result = true;
			}
			}
			@@ -2054,9 +2587,15 @@
			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply(HydroPumpViewModel visualViewModel, HydroPumpMatchingViewModel matching)
			public static bool Apply
			(
			HydroPumpViewModel visualViewModel,
			HydroPumpMatchingViewModel matching,
			HydroChangeHelper changeHelper = null,
			HydroPropStatusHelper propStatusHelper = null
			)
			{
			var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching);
			var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching, changeHelper, propStatusHelper);
			visualViewModel.UpdateProperty();
			return bol;
			}
			@@ -2064,7 +2603,14 @@
			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroPumpInfo visual, HydroPumpMatchingViewModel matching)
			public static bool Apply
			(
			Yw.Model.HydroModelInfo hydroInfo,
			Yw.Model.HydroPumpInfo visual,
			HydroPumpMatchingViewModel matching,
			HydroChangeHelper changeHelper = null,
			HydroPropStatusHelper propStatusHelper = null
			)
			{
			if (hydroInfo == null)
			{
			@@ -2079,66 +2625,99 @@
			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;
			//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}");
			if (visual.ModelType != matching.MatchingModelType)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.ModelType), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.ModelType = matching.MatchingModelType;
			result = true;
			}
			if (!string.IsNullOrEmpty(matching.MatchingDbId))
			{
			visual.UpdatePropStatus(nameof(visual.DbId), ePropStatus.Matching, $"通过基础数据匹配修复，原始数据:{visual.DbId}");
			if (visual.DbId != matching.MatchingDbId)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.DbId), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.DbId = matching.MatchingDbId;
			result = true;
			}
			if (matching.MatchingRatedQ.HasValue)
			{
			visual.UpdatePropStatus(nameof(visual.RatedQ), ePropStatus.Matching, $"通过基础数据匹配修复，原始数据:{visual.RatedQ}");
			if (visual.RatedQ != matching.MatchingRatedQ.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.RatedQ), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.RatedQ = matching.MatchingRatedQ.Value;
			result = true;
			}
			if (matching.MatchingRatedH.HasValue)
			{
			visual.UpdatePropStatus(nameof(visual.RatedH), ePropStatus.Matching, $"通过基础数据匹配修复，原始数据:{visual.RatedH}");
			if (visual.RatedH != matching.MatchingRatedH.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.RatedH), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.RatedH = matching.MatchingRatedH.Value;
			result = true;
			}
			if (matching.MatchingRatedP.HasValue)
			{
			visual.UpdatePropStatus(nameof(visual.RatedP), ePropStatus.Matching, $"通过基础数据匹配修复，原始数据:{visual.RatedP}");
			if (visual.RatedP != matching.MatchingRatedP.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.RatedP), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.RatedP = matching.MatchingRatedP.Value;
			result = true;
			}
			if (matching.MatchingRatedN.HasValue)
			{
			visual.UpdatePropStatus(nameof(visual.RatedN), ePropStatus.Matching, $"通过基础数据匹配修复，原始数据:{visual.RatedN}");
			if (visual.RatedN != matching.MatchingRatedN.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.RatedN), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.RatedN = matching.MatchingRatedN.Value;
			result = true;
			}
			if (matching.MatchingRatedHz.HasValue)
			{
			visual.UpdatePropStatus(nameof(visual.RatedHz), ePropStatus.Matching, $"通过基础数据匹配修复，原始数据:{visual.RatedHz}");
			if (visual.RatedHz != matching.MatchingRatedHz.Value)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.RatedHz), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			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;
			var speedRatio = matching.MatchingCurrentHz.Value / visual.RatedHz;
			if (visual.SpeedRatio != speedRatio)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.SpeedRatio), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.SpeedRatio = speedRatio;
			result = true;
			}

			@@ -2162,8 +2741,10 @@
			hydroInfo.Curves = new List<Yw.Model.HydroCurveInfo>();
			}
			hydroInfo.Curves.Add(curveqh);
			visual.UpdatePropStatus(nameof(visual.CurveQH), ePropStatus.Matching, $"通过基础数据匹配修复");
			visual.CurveQH = curveqh.Code;
			changeHelper?.Append(curveqh, eChangeType.Add);
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.CurveQH), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			result = true;
			}
			else
			@@ -2172,6 +2753,7 @@
			{
			curveqh.DbId = matching.MatchingCurveDbId;
			curveqh.CurveData = matching.MatchingCurveQH?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
			changeHelper?.Append(curveqh, eChangeType.Update);
			result = true;
			}
			}
			@@ -2194,8 +2776,10 @@
			hydroInfo.Curves = new List<Yw.Model.HydroCurveInfo>();
			}
			hydroInfo.Curves.Add(curveqp);
			visual.UpdatePropStatus(nameof(visual.CurveQP), ePropStatus.Matching, $"通过基础数据匹配修复");
			visual.CurveQP = curveqp.Code;
			changeHelper?.Append(curveqp, eChangeType.Add);
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.CurveQP), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			result = true;
			}
			else
			@@ -2204,6 +2788,7 @@
			{
			curveqp.DbId = matching.MatchingCurveDbId;
			curveqp.CurveData = matching.MatchingCurveQP?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
			changeHelper?.Append(curveqp, eChangeType.Update);
			result = true;
			}
			}
			@@ -2226,8 +2811,10 @@
			hydroInfo.Curves = new List<Yw.Model.HydroCurveInfo>();
			}
			hydroInfo.Curves.Add(curveqe);
			visual.UpdatePropStatus(nameof(visual.CurveQE), ePropStatus.Matching, $"通过基础数据匹配修复");
			visual.CurveQE = curveqe.Code;
			changeHelper?.Append(curveqe, eChangeType.Add);
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.CurveQE), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			result = true;
			}
			else
			@@ -2236,6 +2823,7 @@
			{
			curveqe.DbId = matching.MatchingCurveDbId;
			curveqe.CurveData = matching.MatchingCurveQE?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
			changeHelper?.Append(curveqe, eChangeType.Update);
			result = true;
			}
			}
			@@ -2293,37 +2881,31 @@
			{
			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;
			}
			@@ -2333,7 +2915,6 @@
			{
			if (!string.IsNullOrEmpty(matching.MatchingValveSetting))
			{
			visual.UpdatePropStatus(nameof(visual.ValveSetting), ePropStatus.Matching, "通过基础数据匹配修复");
			visual.ValveSetting = matching.MatchingValveSetting;
			result = true;
			}
			@@ -2343,7 +2924,6 @@
			{
			if (!string.IsNullOrEmpty(matching.MatchingValveSetting))
			{
			visual.UpdatePropStatus(nameof(visual.ValveSetting), ePropStatus.Matching, "通过基础数据匹配修复");
			visual.ValveSetting = matching.MatchingValveSetting;
			result = true;
			}
			@@ -2353,7 +2933,6 @@
			{
			if (!string.IsNullOrEmpty(matching.MatchingValveSetting))
			{
			visual.UpdatePropStatus(nameof(visual.ValveSetting), ePropStatus.Matching, "通过基础数据匹配修复");
			visual.ValveSetting = matching.MatchingValveSetting;
			result = true;
			}
			@@ -2363,7 +2942,6 @@
			{
			if (!string.IsNullOrEmpty(matching.MatchingValveSetting))
			{
			visual.UpdatePropStatus(nameof(visual.ValveSetting), ePropStatus.Matching, "通过基础数据匹配修复");
			visual.ValveSetting = matching.MatchingValveSetting;
			result = true;
			}
			@@ -2399,6 +2977,7 @@
			if (!curveol.DbLocked)
			{
			curveol.DbId = matching.MatchingCurveDbId;
			curveol.CurveType = Yw.WinFrmUI.HydroCurveType.CurveOL;
			curveol.CurveData = matching.MatchingCurveOL?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
			result = true;
			}
			@@ -2436,6 +3015,7 @@
			if (!curveql.DbLocked)
			{
			curveql.DbId = matching.MatchingCurveDbId;
			curveql.CurveType = Yw.WinFrmUI.HydroCurveType.CurveQL;
			curveql.CurveData = matching.MatchingCurveQL?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
			result = true;
			}
			@@ -2602,31 +3182,26 @@
			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;
			}