修改泵匹配选择逻辑

duheng

2024-10-30 504a7540001f5805938c83ed67a28d86d68b8808

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/PumpSingleMatchingViewModel.cs

@@ -1,15 +1,15 @@
namespace HStation.WinFrmUI.Xhs
namespace HStation.WinFrmUI
{
    public class PumpSingleMatchingViewModel
    {
        public PumpSingleMatchingViewModel(Vmo.PumpSeriesVmo rhs)
        public PumpSingleMatchingViewModel(Vmo.AssetsPumpSeriesVmo rhs)
        {
            this.ID = rhs.ID;
            this.Name = rhs.Name;
            this.IsPump = false;
        }

        public PumpSingleMatchingViewModel(Vmo.PumpGroupVmo rhs)
        public PumpSingleMatchingViewModel(Vmo.AssetsPumpGroupVmo rhs)
        {
            this.ID = rhs.ID;
            this.Name = rhs.Name;
@@ -17,7 +17,7 @@
            this.IsPump = false;
        }

        public PumpSingleMatchingViewModel(Vmo.PumpMainVmo rhs, long GroupID)
        public PumpSingleMatchingViewModel(Vmo.AssetsPumpMainVmo rhs, long GroupID)
        {
            this.ID = rhs.ID;
            this.Name = rhs.Name;
@@ -25,7 +25,7 @@
            this.IsPump = true;
        }

        public PumpSingleMatchingViewModel(Vmo.PumpMainVmo rhs)
        public PumpSingleMatchingViewModel(Vmo.AssetsPumpMainVmo rhs)
        {
            this.ID = rhs.ID;
            this.Name = rhs.Name;
@@ -35,6 +35,7 @@
            this.RatedPower = rhs.RatedPower;
            this.RatedFlow = rhs.RatedFlow;
            this.RatedSpeed = rhs.RatedSpeed;
            this.RatedHead = rhs.RatedHead;
            this.RatedEfficiency = rhs.RatedEfficiency;
            this.D2 = rhs.D2;
            this.Description = rhs.Description;
@@ -111,4 +112,12 @@
        /// </summary>
        public string Description { get; set; }
    }
}

public class PhartViewModel
{
    public long ID { get; set; }
    public string OtherName { get; set; }
    public int Importance { get; set; }
    public int SortCode { get; set; }
}