Merge branch 'master' of http://47.103.154.90:83/r/IStation/Service.V4.1

tangxu

2022-11-08 5b5c4221ec96596e14da1b5cec9e29f27555daa2

 Calculation/IStation.Calculation.Dispatch/Model/MachineDetail.cs

@@ -34,7 +34,15 @@
        /// <summary>
        /// 
        /// </summary>
        public double Ratedn { get; set; }
        public double RatedQ { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public double RatedH { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public double RatedN { get; set; }
        /// <summary>
        /// 出口口径
        /// </summary>   
@@ -69,7 +77,9 @@
            if (string.IsNullOrEmpty(this.PumpCode))
                this.PumpCode = pump.ID + "|" + engine.ID;//保证为空时 不会影响同型号判断
            this.IsFrequency = pump.RatedParas.IsFrequency;
            this.Ratedn = pump.RatedParas.N;
            this.RatedN = pump.RatedParas.N;
            this.RatedQ = pump.RatedParas.Q;
            this.RatedH = pump.RatedParas.H;
            this.InletCaliber = pump.RatedParas.InletCaliber;
            this.OutletCaliber = pump.RatedParas.OutletCaliber;
        }
@@ -90,7 +100,9 @@
            if (string.IsNullOrEmpty(this.PumpCode))
                this.PumpCode = pump.ID + "|" + engine.ID;//保证为空时 不会影响同型号判断
            this.IsFrequency = pump.RatedParas.IsFrequency;
            this.Ratedn = pump.RatedParas.N;
            this.RatedN = pump.RatedParas.N;
            this.RatedQ = pump.RatedParas.Q;
            this.RatedH = pump.RatedParas.H;
            if (pump_curve != null && pump_curve.CurveInfo != null)
            {
                this.MaxCurveInfoQH = pump_curve.CurveInfo.CurveQH;
@@ -107,8 +119,8 @@
        public double CalcSpeedByFrequence(double Frq)
        {
            if (!IsFrequency)
                return Ratedn;
            return Math.Round(Ratedn * Frq / 50.0, 1);
                return RatedN;
            return Math.Round(RatedN * Frq / 50.0, 1);
        }
    }