ningshuxia
2022-10-31 0171d347fec140d31db39ab5d76d51eebac472c2
Calculation/IStation.Calculation.Dispatch/general/OptAna.cs
@@ -13,6 +13,7 @@
    public  class Calculator_OptAna_General : CalculatorOptAnaBase, IOptAnaCalc
    {
        List<IStation.Calculation.DispatchAna.Model.MachineDetail> allMachineList = null;
        #region 计算 最优方案 
        /// <summary>
        /// 计算 最优方案 
@@ -26,8 +27,7 @@
            IStation.Calculation.DispatchAna.Model.EtaAnaRecord4Station eta_ana_records,
            IStation.Calculation.DispatchAna.Model.MachineRunPara machine_run_status,
            out string error_info)
        {
        {
            var isUsePress = complex_request_paras.PressValueType == Model.RequestParasComplex.ePressValueType.压力 ? true : false;
            if (eta_ana_records != null && eta_ana_records.Q.HasValue && eta_ana_records.H.HasValue)
@@ -107,9 +107,13 @@
            }
            double water_level = 0;//水位
            if (complex_request_paras.WaterLevelPara != null && complex_request_paras.WaterLevelPara.Count > 0)
            if (complex_request_paras.InletPipePara != null && complex_request_paras.InletPipePara.Count > 0)
            {
                water_level = complex_request_paras.WaterLevelPara.First().Value;
                water_level = complex_request_paras.InletPipePara.First().Value;
                if (!complex_request_paras.InletPipePara.First().IsWaterLevel)
                {//换成M
                    water_level = water_level * 102;
                }
            }
@@ -132,8 +136,8 @@
                new IStation.Calculation.DispatchAna.Common.DispatchAnaGeneralHelper压力();
            calc_pipe_helper.InitialParas(
                target_flow,
                water_level,
                target_press,
                water_level,true ,
                target_press,false ,
                complex_request_paras.OutletPipePara[0].TargetFlowRangeMin,
                complex_request_paras.OutletPipePara[0].TargetFlowRangeMax,
                allMachineList,