HStation/XHS.V1.0.git

			@@ -1,5 +1,6 @@
			using DevExpress.XtraSpreadsheet.Model.CopyOperation;
			using System.Windows.Media.Imaging;
			using Yw.Ahart;
			using Yw.DAL.Basic;
			using Yw.EPAnet;
			using Yw.Hydro;
			@@ -67,6 +68,12 @@
			#region 消火栓

			vm.Hydrants = hydroInfo.Hydrants?.Select(x => Create(x, hydroInfo)).ToList();

			#endregion

			#region 冷却塔

			vm.Coolings = hydroInfo.Coolings?.Select(x => Create(x, hydroInfo)).ToList();

			#endregion

			@@ -347,6 +354,38 @@
			return default;
			}
			return new HydroHydrantMatchingViewModel(visualViewModel);
			}

			#endregion

			#region 冷却塔

			/// <summary>
			/// 创建冷却塔自动匹配ViewModel
			/// </summary>
			public static HydroCoolingMatchingViewModel Create(HydroCoolingInfo visualInfo, HydroModelInfo hydroInfo)
			{
			if (visualInfo == null)
			{
			return default;
			}
			if (hydroInfo == null)
			{
			return default;
			}
			return new HydroCoolingMatchingViewModel(visualInfo, hydroInfo);
			}

			/// <summary>
			/// 创建冷却塔自动匹配ViewModel
			/// </summary>
			public static HydroCoolingMatchingViewModel Create(HydroCoolingViewModel visualViewModel)
			{
			if (visualViewModel == null)
			{
			return default;
			}
			return new HydroCoolingMatchingViewModel(visualViewModel);
			}

			#endregion
			@@ -646,7 +685,13 @@
			/// <summary>
			/// 应用自动匹配ViewModel
			/// </summary>
			public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, HydroMatchingViewModel matchingInfo)
			public static bool Apply
			(
			Yw.Model.HydroModelInfo hydroInfo,
			HydroMatchingViewModel matchingInfo,
			HydroChangeHelper changeHelper = null,
			HydroPropStatusHelper propStatusHelper = null
			)
			{
			if (hydroInfo == null)
			{
			@@ -669,7 +714,7 @@
			allTanks.ForEach(x =>
			{
			var matching = matchingInfo.Tanks.Find(t => t.Code == x.Code);
			if (Apply(hydroInfo, x, matching))
			if (Apply(hydroInfo, x, matching, changeHelper, propStatusHelper))
			{
			result = true;
			}
			@@ -689,7 +734,7 @@
			hydroInfo.Bluntheads.ForEach(x =>
			{
			var matching = matchingInfo.Bluntheads.Find(t => t.Code == x.Code);
			if (Apply(hydroInfo, x, matching))
			if (Apply(hydroInfo, x, matching, changeHelper, propStatusHelper))
			{
			result = true;
			}
			@@ -708,7 +753,7 @@
			hydroInfo.Elbows.ForEach(x =>
			{
			var matching = matchingInfo.Elbows.Find(t => t.Code == x.Code);
			if (Apply(hydroInfo, x, matching))
			if (Apply(hydroInfo, x, matching, changeHelper, propStatusHelper))
			{
			result = true;
			}
			@@ -727,7 +772,7 @@
			hydroInfo.Threelinks.ForEach(x =>
			{
			var matching = matchingInfo.Threelinks.Find(t => t.Code == x.Code);
			if (Apply(hydroInfo, x, matching))
			if (Apply(hydroInfo, x, matching, changeHelper, propStatusHelper))
			{
			result = true;
			}
			@@ -746,7 +791,7 @@
			hydroInfo.Fourlinks.ForEach(x =>
			{
			var matching = matchingInfo.Fourlinks.Find(t => t.Code == x.Code);
			if (Apply(hydroInfo, x, matching))
			if (Apply(hydroInfo, x, matching, changeHelper, propStatusHelper))
			{
			result = true;
			}
			@@ -765,7 +810,7 @@
			hydroInfo.Nozzles.ForEach(x =>
			{
			var matching = matchingInfo.Nozzles.Find(t => t.Code == x.Code);
			if (Apply(hydroInfo, x, matching))
			if (Apply(hydroInfo, x, matching, changeHelper, propStatusHelper))
			{
			result = true;
			}
			@@ -784,7 +829,26 @@
			hydroInfo.Hydrants.ForEach(x =>
			{
			var matching = matchingInfo.Hydrants.Find(t => t.Code == x.Code);
			if (Apply(hydroInfo, x, matching))
			if (Apply(hydroInfo, x, matching, changeHelper, propStatusHelper))
			{
			result = true;
			}
			});
			}
			}

			#endregion

			#region 消火栓

			if (hydroInfo.Coolings != null && hydroInfo.Coolings.Count > 0)
			{
			if (matchingInfo.Coolings != null && matchingInfo.Coolings.Count > 0)
			{
			hydroInfo.Coolings.ForEach(x =>
			{
			var matching = matchingInfo.Coolings.Find(t => t.Code == x.Code);
			if (Apply(hydroInfo, x, matching, changeHelper, propStatusHelper))
			{
			result = true;
			}
			@@ -803,7 +867,7 @@
			hydroInfo.Meters.ForEach(x =>
			{
			var matching = matchingInfo.Meters.Find(t => t.Code == x.Code);
			if (Apply(hydroInfo, x, matching))
			if (Apply(hydroInfo, x, matching, changeHelper, propStatusHelper))
			{
			result = true;
			}
			@@ -822,7 +886,7 @@
			hydroInfo.Flowmeters.ForEach(x =>
			{
			var matching = matchingInfo.Flowmeters.Find(t => t.Code == x.Code);
			if (Apply(hydroInfo, x, matching))
			if (Apply(hydroInfo, x, matching, changeHelper, propStatusHelper))
			{
			result = true;
			}
			@@ -841,7 +905,7 @@
			hydroInfo.Pressmeters.ForEach(x =>
			{
			var matching = matchingInfo.Pressmeters.Find(t => t.Code == x.Code);
			if (Apply(hydroInfo, x, matching))
			if (Apply(hydroInfo, x, matching, changeHelper, propStatusHelper))
			{
			result = true;
			}
			@@ -860,7 +924,7 @@
			hydroInfo.Pipes.ForEach(x =>
			{
			var matching = matchingInfo.Pipes.Find(t => t.Code == x.Code);
			if (Apply(hydroInfo, x, matching))
			if (Apply(hydroInfo, x, matching, changeHelper, propStatusHelper))
			{
			result = true;
			}
			@@ -879,7 +943,7 @@
			hydroInfo.Translations.ForEach(x =>
			{
			var matching = matchingInfo.Translations.Find(t => t.Code == x.Code);
			if (Apply(hydroInfo, x, matching))
			if (Apply(hydroInfo, x, matching, changeHelper, propStatusHelper))
			{
			result = true;
			}
			@@ -898,7 +962,7 @@
			hydroInfo.Pumps.ForEach(x =>
			{
			var matching = matchingInfo.Pumps.Find(t => t.Code == x.Code);
			if (Apply(hydroInfo, x, matching))
			if (Apply(hydroInfo, x, matching, changeHelper, propStatusHelper))
			{
			result = true;
			}
			@@ -917,7 +981,7 @@
			hydroInfo.Valves.ForEach(x =>
			{
			var matching = matchingInfo.Valves.Find(t => t.Code == x.Code);
			if (Apply(hydroInfo, x, matching))
			if (Apply(hydroInfo, x, matching, changeHelper, propStatusHelper))
			{
			result = true;
			}
			@@ -936,7 +1000,7 @@
			hydroInfo.Exchangers.ForEach(x =>
			{
			var matching = matchingInfo.Exchangers.Find(t => t.Code == x.Code);
			if (Apply(hydroInfo, x, matching))
			if (Apply(hydroInfo, x, matching, changeHelper, propStatusHelper))
			{
			result = true;
			}
			@@ -955,7 +1019,7 @@
			hydroInfo.Compressors.ForEach(x =>
			{
			var matching = matchingInfo.Compressors.Find(t => t.Code == x.Code);
			if (Apply(hydroInfo, x, matching))
			if (Apply(hydroInfo, x, matching, changeHelper, propStatusHelper))
			{
			result = true;
			}
			@@ -973,9 +1037,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;
			}
			@@ -983,7 +1053,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)
			{
			@@ -997,51 +1074,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))
			{
			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.MatchingMinLevel.HasValue)
			{
			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)
			{
			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)
			{
			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)
			{
			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)
			{
			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;
			}
			@@ -1057,7 +1169,7 @@
			curvevol.ModelType = string.Empty;
			curvevol.DbLocked = false;
			curvevol.DbId = matching.MatchingCurveDbId;
			curvevol.CurveType = Yw.WinFrmUI.HydroCurve.TankVol;
			curvevol.CurveType = Yw.WinFrmUI.HydroCurveType.CurveVol;
			curvevol.CurveData = matching.MatchingVolCurve?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
			if (hydroInfo.Curves == null)
			{
			@@ -1065,6 +1177,7 @@
			}
			hydroInfo.Curves.Add(curvevol);
			visual.VolCurve = curvevol.Code;
			changeHelper?.Append(curvevol, eChangeType.Add);
			result = true;
			}
			else
			@@ -1073,7 +1186,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);
			}
			}
			}
			@@ -1088,9 +1216,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;
			}
			@@ -1098,7 +1232,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)
			{
			@@ -1112,39 +1253,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;
			}
			@@ -1159,9 +1325,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;
			}
			@@ -1169,7 +1341,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)
			{
			@@ -1183,55 +1362,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;
			}
			}
			@@ -1245,9 +1460,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;
			}
			@@ -1255,7 +1476,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)
			{
			@@ -1269,51 +1497,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;
			}
			@@ -1328,9 +1591,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;
			}
			@@ -1338,7 +1607,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)
			{
			@@ -1352,39 +1628,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;
			}
			@@ -1399,9 +1700,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;
			}
			@@ -1409,7 +1716,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)
			{
			@@ -1423,45 +1737,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;
			}
			@@ -1476,9 +1820,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;
			}
			@@ -1486,7 +1836,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)
			{
			@@ -1500,46 +1857,207 @@
			{
			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;
			}
			}
			return result;
			}

			#endregion

			#region 冷却塔

			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply
			(
			HydroCoolingViewModel visualViewModel,
			HydroCoolingMatchingViewModel matching,
			HydroChangeHelper changeHelper = null,
			HydroPropStatusHelper propStatusHelper = null
			)
			{
			var bol = Apply(visualViewModel.HydroInfo, visualViewModel.Vmo, matching, changeHelper, propStatusHelper);
			visualViewModel.UpdateProperty();
			return bol;
			}

			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply
			(
			Yw.Model.HydroModelInfo hydroInfo,
			Yw.Model.HydroCoolingInfo visual,
			HydroCoolingMatchingViewModel matching,
			HydroChangeHelper changeHelper = null,
			HydroPropStatusHelper propStatusHelper = null
			)
			{
			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;
			//visual.LowerLimit = matching.LowerLimit;

			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;
			}
			if (matching.MatchingLowerLimit.HasValue)
			{
			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;
			}
			}
			@@ -1553,9 +2071,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;
			}
			@@ -1563,7 +2087,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)
			{
			@@ -1577,27 +2108,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;
			}
			@@ -1612,9 +2158,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;
			}
			@@ -1622,7 +2174,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)
			{
			@@ -1636,27 +2195,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;
			}
			@@ -1671,9 +2245,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;
			}
			@@ -1681,7 +2261,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)
			{
			@@ -1695,27 +2282,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;
			}
			@@ -1730,9 +2332,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;
			}
			@@ -1740,7 +2348,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)
			{
			@@ -1755,14 +2370,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;

			@@ -1770,31 +2385,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;
			}
			@@ -1809,9 +2454,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;
			}
			@@ -1819,7 +2470,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)
			{
			@@ -1834,16 +2492,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;

			@@ -1851,42 +2509,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;
			}
			}
			@@ -1900,9 +2598,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;
			}
			@@ -1910,7 +2614,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)
			{
			@@ -1925,58 +2636,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))
			{
			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.MatchingRatedQ.HasValue)
			{
			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)
			{
			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)
			{
			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)
			{
			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)
			{
			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.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;
			}

			@@ -1993,7 +2745,7 @@
			curveqh.ModelType = string.Empty;
			curveqh.DbLocked = false;
			curveqh.DbId = matching.MatchingCurveDbId;
			curveqh.CurveType = Yw.WinFrmUI.HydroCurve.PumpQH;
			curveqh.CurveType = Yw.WinFrmUI.HydroCurveType.CurveQH;
			curveqh.CurveData = matching.MatchingCurveQH?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
			if (hydroInfo.Curves == null)
			{
			@@ -2001,6 +2753,8 @@
			}
			hydroInfo.Curves.Add(curveqh);
			visual.CurveQH = curveqh.Code;
			changeHelper?.Append(curveqh, eChangeType.Add);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.CurveQH), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			result = true;
			}
			else
			@@ -2009,6 +2763,8 @@
			{
			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);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.CurveQH), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			result = true;
			}
			}
			@@ -2024,7 +2780,7 @@
			curveqp.ModelType = string.Empty;
			curveqp.DbLocked = false;
			curveqp.DbId = matching.MatchingCurveDbId;
			curveqp.CurveType = Yw.WinFrmUI.HydroCurve.PumpQP;
			curveqp.CurveType = Yw.WinFrmUI.HydroCurveType.CurveQP;
			curveqp.CurveData = matching.MatchingCurveQP?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
			if (hydroInfo.Curves == null)
			{
			@@ -2032,6 +2788,8 @@
			}
			hydroInfo.Curves.Add(curveqp);
			visual.CurveQP = curveqp.Code;
			changeHelper?.Append(curveqp, eChangeType.Add);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.CurveQP), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			result = true;
			}
			else
			@@ -2040,6 +2798,8 @@
			{
			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);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.CurveQP), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			result = true;
			}
			}
			@@ -2055,7 +2815,7 @@
			curveqe.ModelType = string.Empty;
			curveqe.DbLocked = false;
			curveqe.DbId = matching.MatchingCurveDbId;
			curveqe.CurveType = Yw.WinFrmUI.HydroCurve.PumpQE;
			curveqe.CurveType = Yw.WinFrmUI.HydroCurveType.CurveQE;
			curveqe.CurveData = matching.MatchingCurveQE?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
			if (hydroInfo.Curves == null)
			{
			@@ -2063,6 +2823,8 @@
			}
			hydroInfo.Curves.Add(curveqe);
			visual.CurveQE = curveqe.Code;
			changeHelper?.Append(curveqe, eChangeType.Add);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.CurveQE), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			result = true;
			}
			else
			@@ -2071,7 +2833,42 @@
			{
			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);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.CurveQE), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			result = true;
			}
			}
			}
			else
			{
			if (!string.IsNullOrEmpty(visual.CurveQH))
			{
			var curveQH = hydroInfo?.Curves?.Find(x => x.Code == visual.CurveQH);
			if (curveQH != null)
			{
			hydroInfo.Curves?.RemoveAll(x => x.Code == visual.CurveQH);
			visual.CurveQH = string.Empty;
			changeHelper?.Append(curveQH, eChangeType.Remove);
			}
			}
			if (!string.IsNullOrEmpty(visual.CurveQP))
			{
			var curveQP = hydroInfo?.Curves?.Find(x => x.Code == visual.CurveQP);
			if (curveQP != null)
			{
			hydroInfo.Curves?.RemoveAll(x => x.Code == visual.CurveQP);
			visual.CurveQP = string.Empty;
			changeHelper?.Append(curveQP, eChangeType.Remove);
			}
			}
			if (!string.IsNullOrEmpty(visual.CurveQE))
			{
			var curveQE = hydroInfo?.Curves?.Find(x => x.Code == visual.CurveQE);
			if (curveQE != null)
			{
			hydroInfo.Curves?.RemoveAll(x => x.Code == visual.CurveQE);
			visual.CurveQE = string.Empty;
			changeHelper?.Append(curveQE, eChangeType.Remove);
			}
			}
			}
			@@ -2087,9 +2884,15 @@
			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply(HydroValveViewModel visualViewModel, HydroValveMatchingViewModel matching)
			public static bool Apply
			(
			HydroValveViewModel visualViewModel,
			HydroValveMatchingViewModel 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;
			}
			@@ -2097,7 +2900,14 @@
			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroValveInfo visual, HydroValveMatchingViewModel matching)
			public static bool Apply
			(
			Yw.Model.HydroModelInfo hydroInfo,
			Yw.Model.HydroValveInfo visual,
			HydroValveMatchingViewModel matching,
			HydroChangeHelper changeHelper = null,
			HydroPropStatusHelper propStatusHelper = null
			)
			{
			if (hydroInfo == null)
			{
			@@ -2112,15 +2922,15 @@
			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;
			// 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;

			@@ -2128,32 +2938,63 @@
			{
			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.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.MatchingValveType.HasValue)
			{
			visual.ValveType = HydroValveTypeEnumHelper.GetValveTypeCode(matching.MatchingValveType.Value);
			var valveType = HydroValveTypeEnumHelper.GetValveTypeCode(matching.MatchingValveType.Value);
			if (visual.ValveType != valveType)
			{
			changeHelper?.Append(visual, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.ValveType), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			}
			visual.ValveType = valveType;
			result = true;
			}
			switch (visual.ValveType)
			@@ -2209,7 +3050,7 @@
			curveol.ModelType = visual.ModelType;
			curveol.DbLocked = false;
			curveol.DbId = matching.MatchingCurveDbId;
			curveol.CurveType = Yw.WinFrmUI.HydroCurve.ValveOL;
			curveol.CurveType = Yw.WinFrmUI.HydroCurveType.CurveOL;
			curveol.CurveData = matching.MatchingCurveOL?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
			if (hydroInfo.Curves == null)
			{
			@@ -2224,6 +3065,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;
			}
			@@ -2235,7 +3077,7 @@
			{
			if (!string.IsNullOrEmpty(matching.MatchingCurveDbId))
			{
			//阀门开度损失系数曲线
			//水头损失曲线
			var curveql = hydroInfo.Curves?.Find(x => x.Code == visual.ValveSetting);
			if (curveql == null)
			{
			@@ -2246,7 +3088,7 @@
			curveql.ModelType = visual.ModelType;
			curveql.DbLocked = false;
			curveql.DbId = matching.MatchingCurveDbId;
			curveql.CurveType = Yw.WinFrmUI.HydroCurve.ValveOL;
			curveql.CurveType = Yw.WinFrmUI.HydroCurveType.CurveQL;
			curveql.CurveData = matching.MatchingCurveQL?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
			if (hydroInfo.Curves == null)
			{
			@@ -2261,6 +3103,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;
			}
			@@ -2285,9 +3128,15 @@
			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply(HydroExchangerViewModel visualViewModel, HydroExchangerMatchingViewModel matching)
			public static bool Apply
			(
			HydroExchangerViewModel visualViewModel,
			HydroExchangerMatchingViewModel 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;
			}
			@@ -2295,7 +3144,14 @@
			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroExchangerInfo visual, HydroExchangerMatchingViewModel matching)
			public static bool Apply
			(
			Yw.Model.HydroModelInfo hydroInfo,
			Yw.Model.HydroExchangerInfo visual,
			HydroExchangerMatchingViewModel matching,
			HydroChangeHelper changeHelper = null,
			HydroPropStatusHelper propStatusHelper = null
			)
			{
			if (hydroInfo == null)
			{
			@@ -2309,39 +3165,64 @@
			{
			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.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))
			{
			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.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;
			}
			@@ -2358,7 +3239,7 @@
			curvevql.ModelType = string.Empty;
			curvevql.DbLocked = false;
			curvevql.DbId = matching.MatchingCurveDbId;
			curvevql.CurveType = Yw.WinFrmUI.HydroCurve.ExchangerQL;
			curvevql.CurveType = Yw.WinFrmUI.HydroCurveType.CurveQL;
			curvevql.CurveData = matching.MatchingCurveQL?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
			if (hydroInfo.Curves == null)
			{
			@@ -2366,6 +3247,8 @@
			}
			hydroInfo.Curves.Add(curvevql);
			visual.CurveQL = curvevql.Code;
			changeHelper?.Append(curvevql, eChangeType.Add);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.CurveQL), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			result = true;
			}
			else
			@@ -2374,7 +3257,22 @@
			{
			curvevql.DbId = matching.MatchingCurveDbId;
			curvevql.CurveData = matching.MatchingCurveQL?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
			changeHelper?.Append(curvevql, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.CurveQL), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			result = true;
			}
			}
			}
			else
			{
			if (!string.IsNullOrEmpty(visual.CurveQL))
			{
			var curveql = hydroInfo?.Curves?.Find(x => x.Code == visual.CurveQL);
			if (curveql != null)
			{
			hydroInfo.Curves?.RemoveAll(x => x.Code == visual.CurveQL);
			visual.CurveQL = string.Empty;
			changeHelper?.Append(curveql, eChangeType.Remove);
			}
			}
			}
			@@ -2389,9 +3287,15 @@
			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply(HydroCompressorViewModel visualViewModel, HydroCompressorMatchingViewModel matching)
			public static bool Apply
			(
			HydroCompressorViewModel visualViewModel,
			HydroCompressorMatchingViewModel 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;
			}
			@@ -2399,7 +3303,14 @@
			/// <summary>
			/// 应用
			/// </summary>
			public static bool Apply(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroCompressorInfo visual, HydroCompressorMatchingViewModel matching)
			public static bool Apply
			(
			Yw.Model.HydroModelInfo hydroInfo,
			Yw.Model.HydroCompressorInfo visual,
			HydroCompressorMatchingViewModel matching,
			HydroChangeHelper changeHelper = null,
			HydroPropStatusHelper propStatusHelper = null
			)
			{
			if (hydroInfo == null)
			{
			@@ -2413,45 +3324,65 @@
			{
			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.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))
			{
			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;
			visual.UpdatePropStatus(nameof(visual.ModelType), ePropStatus.Normal, "匹配修复");
			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;
			visual.UpdatePropStatus(nameof(visual.DbId), ePropStatus.Normal, "匹配修复");
			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;
			visual.UpdatePropStatus(nameof(visual.Material), ePropStatus.Normal, "匹配修复");
			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;
			visual.UpdatePropStatus(nameof(visual.Diameter), ePropStatus.Normal, "匹配修复");
			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;
			visual.UpdatePropStatus(nameof(visual.MinorLoss), ePropStatus.Normal, "匹配修复");
			result = true;
			}

			@@ -2467,7 +3398,7 @@
			curvevql.ModelType = string.Empty;
			curvevql.DbLocked = false;
			curvevql.DbId = matching.MatchingCurveDbId;
			curvevql.CurveType = Yw.WinFrmUI.HydroCurve.CompressorQL;
			curvevql.CurveType = Yw.WinFrmUI.HydroCurveType.CurveQL;
			curvevql.CurveData = matching.MatchingCurveQL?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
			if (hydroInfo.Curves == null)
			{
			@@ -2475,6 +3406,8 @@
			}
			hydroInfo.Curves.Add(curvevql);
			visual.CurveQL = curvevql.Code;
			changeHelper?.Append(curvevql, eChangeType.Add);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.CurveQL), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			result = true;
			}
			else
			@@ -2483,10 +3416,25 @@
			{
			curvevql.DbId = matching.MatchingCurveDbId;
			curvevql.CurveData = matching.MatchingCurveQL?.Select(x => new Yw.Model.Hydro.CurvePoint(x.X, x.Y)).ToList();
			changeHelper?.Append(curvevql, eChangeType.Update);
			propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.CurveQL), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
			result = true;
			}
			}
			}
			else
			{
			if (!string.IsNullOrEmpty(visual.CurveQL))
			{
			var curveql = hydroInfo?.Curves?.Find(x => x.Code == visual.CurveQL);
			if (curveql != null)
			{
			hydroInfo.Curves?.RemoveAll(x => x.Code == visual.CurveQL);
			visual.CurveQL = string.Empty;
			changeHelper?.Append(curveql, eChangeType.Remove);
			}
			}
			}
			}
			return result;
			}