增加单泵详细信息窗体

duheng

2024-10-23 b9583c5c06b2b188940caa606a6ba04722bdb721

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingParasHelper.cs

@@ -11,7 +11,7 @@
        /// <summary>
        /// 创建资产自动匹配ViewModel
        /// </summary>
        public static AssetsMatchingViewModel Create(Yw.Model.HydroModelInfo hydroInfo)
        public static AssetsMatchingViewModel Create(Yw.Model.HydroModelInfo hydroInfo, List<IHydroCalcuResult> allCalcuResultList)
        {
            if (hydroInfo == null)
            {
@@ -20,22 +20,22 @@
            var input = new AssetsMatchingViewModel();

            //水泵
            input.PumpMatchingList = hydroInfo.Pumps?.Select(x => Create(hydroInfo, x)).ToList();
            input.PumpMatchingList = hydroInfo.Pumps?.Select(x => Create(hydroInfo, x, allCalcuResultList)).ToList();

            //阀门
            input.ValveMatchingList = hydroInfo.Valves?.Select(x => Create(hydroInfo, x)).ToList();
            input.ValveMatchingList = hydroInfo.Valves?.Select(x => Create(hydroInfo, x, allCalcuResultList)).ToList();

            //管道
            input.PipeMatchingList = hydroInfo.Pipes?.Select(x => Create(hydroInfo, x)).ToList();
            input.PipeMatchingList = hydroInfo.Pipes?.Select(x => Create(hydroInfo, x, allCalcuResultList)).ToList();

            //弯头
            input.ElbowMatchingList = hydroInfo.Elbows?.Select(x => Create(hydroInfo, x)).ToList();
            input.ElbowMatchingList = hydroInfo.Elbows?.Select(x => Create(hydroInfo, x, allCalcuResultList)).ToList();

            //三通
            input.ThreelinkMatchingList = hydroInfo.Threelinks?.Select(x => Create(hydroInfo, x)).ToList();
            input.ThreelinkMatchingList = hydroInfo.Threelinks?.Select(x => Create(hydroInfo, x, allCalcuResultList)).ToList();

            //四通
            input.FourlinkMatchingList = hydroInfo.Fourlinks?.Select(x => Create(hydroInfo, x)).ToList();
            input.FourlinkMatchingList = hydroInfo.Fourlinks?.Select(x => Create(hydroInfo, x, allCalcuResultList)).ToList();

            return input;
        }
@@ -43,7 +43,7 @@
        /// <summary>
        /// 创建泵自动匹配ViewModel
        /// </summary>
        public static PumpMatchingViewModel Create(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroPumpInfo pumpInfo)
        public static PumpMatchingViewModel Create(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroPumpInfo pumpInfo, List<IHydroCalcuResult> allCalcuResultList)
        {
            if (hydroInfo == null)
            {
@@ -53,26 +53,13 @@
            {
                return default;
            }
            return new PumpMatchingViewModel()
            {
                ID = pumpInfo.ID,
                Code = pumpInfo.Code,
                Name = pumpInfo.Name,
                DbLocked = pumpInfo.DbLocked,
                ModelType = pumpInfo.ModelType,
                DbId = pumpInfo.DbId,
                CurveDbId = hydroInfo.Curves?.Find(t => t.Code == pumpInfo.CurveQH)?.DbId,
                RatedP = pumpInfo.RatedP,
                RatedH = pumpInfo.RatedH,
                RatedN = pumpInfo.RatedN,
                RatedQ = pumpInfo.RatedQ,
            };
            return new PumpMatchingViewModel(pumpInfo, hydroInfo, allCalcuResultList);
        }

        /// <summary>
        /// 创建阀门自动匹配ViewModel
        /// </summary>
        public static ValveMatchingViewModel Create(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroValveInfo valveInfo)
        public static ValveMatchingViewModel Create(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroValveInfo valveInfo, List<IHydroCalcuResult> allCalcuResultList)
        {
            if (hydroInfo == null)
            {
@@ -100,7 +87,7 @@
        /// <summary>
        /// 创建管道自动匹配ViewModel
        /// </summary>
        public static PipeMatchingViewModel Create(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroPipeInfo pipeInfo)
        public static PipeMatchingViewModel Create(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroPipeInfo pipeInfo, List<IHydroCalcuResult> allCalcuResultList)
        {
            if (hydroInfo == null)
            {
@@ -129,7 +116,7 @@
        /// <summary>
        /// 创建弯头自动匹配ViewModel
        /// </summary>
        public static ElbowMatchingViewModel Create(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroElbowInfo elbowInfo)
        public static ElbowMatchingViewModel Create(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroElbowInfo elbowInfo, List<IHydroCalcuResult> allCalcuResultList)
        {
            if (hydroInfo == null)
            {
@@ -156,7 +143,7 @@
        /// <summary>
        /// 创建三通自动匹配ViewModel
        /// </summary>
        public static ThreelinkMatchingViewModel Create(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroThreelinkInfo threelinkInfo)
        public static ThreelinkMatchingViewModel Create(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroThreelinkInfo threelinkInfo, List<IHydroCalcuResult> allCalcuResultList)
        {
            if (hydroInfo == null)
            {
@@ -183,7 +170,7 @@
        /// <summary>
        /// 创建四通自动匹配ViewModel
        /// </summary>
        public static FourlinkMatchingViewModel Create(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroFourlinkInfo fourlinkInfo)
        public static FourlinkMatchingViewModel Create(Yw.Model.HydroModelInfo hydroInfo, Yw.Model.HydroFourlinkInfo fourlinkInfo, List<IHydroCalcuResult> allCalcuResultList)
        {
            if (hydroInfo == null)
            {
@@ -309,6 +296,7 @@
                pump.RatedQ = matching.RatedQ;
                pump.RatedH = matching.RatedH;
                pump.RatedN = matching.RatedN;
                pump.RatedHz = matching.RatedHz;

                if (!pump.DbLocked)
                {
@@ -460,7 +448,7 @@
                valve.Material = matching.Material;
                valve.MinorLoss = matching.MinorLoss;
                valve.ValveType = matching.ValveType;
                valve.ValveSetting = matching.ValveSetting;
                //valve.ValveSetting = matching.ValveSetting;

                if (!valve.DbLocked)
                {