tangxu
2022-10-31 8ea88fedd51e4961d0fd0aec6c2873a579fb6db8
Calculation/IStation.Calculation.Dispatch/custom/shys/station/³¤Ð˵º/KeepStatus.cs
@@ -70,9 +70,9 @@
            double water_level = 0;//水位
            if (_request_paras.WaterLevelPara != null && _request_paras.WaterLevelPara.Count > 0)
            if (_request_paras.InletPipePara != null && _request_paras.InletPipePara.Count > 0)
            {
                water_level = _request_paras.WaterLevelPara.First().Value;
                water_level = _request_paras.InletPipePara.First().Value;
            }
@@ -112,8 +112,8 @@
                    new Common.DispatchAnaGeneralHelper压力();
                calc_pipe_helper.InitialParas(
                    pipe1_TargetFlow + pipe2_TargetFlow,
                    water_level,
                    press,
                    water_level,true ,
                    press, false,
                    null, null,
                    allMachineList, null);
@@ -121,9 +121,6 @@
            }
            else //阀门关的状态下  ä¸¤ç®¡ç›¸è¿žæ•°æ®ç›¸åŠ 
            {
                var pipe1_machineIds = new List<long>() { 19, 22 };//1号泵,2号泵
                var pipe2_machineIds = new List<long>() { 25, 28 };//3号泵,4号泵
                Common.DispatchAnaGeneralHelper压力 calc_pipe1_helper
                    = new Common.DispatchAnaGeneralHelper压力();
@@ -134,8 +131,8 @@
                {//只开一号泵二号泵   
                    calc_pipe1_helper.InitialParas(
                        pipe1_TargetFlow,
                        water_level,
                        pipe1_TargetPess,
                        water_level, true,
                        pipe1_TargetPess, false,
                        null, null,
                        (from x in allMachineList where pipe1_machineIds.Contains(x.MachineID) select x).ToList(), null);
@@ -145,8 +142,8 @@
                {
                    calc_pipe2_helper.InitialParas(
                        pipe2_TargetFlow,
                        water_level,
                        pipe2_TargetPess,
                        water_level, true,
                        pipe2_TargetPess, false,
                        null, null,
                        (from x in allMachineList where pipe2_machineIds.Contains(x.MachineID) select x).ToList(), null);
@@ -158,8 +155,8 @@
                calc_pipe1_helper.InitialParas(
                    pipe1_TargetFlow,
                    water_level,
                    pipe1_TargetPess,
                    water_level, true,
                    pipe1_TargetPess, false,
                     null, null,
                    (from x in allMachineList where pipe1_machineIds.Contains(x.MachineID) select x).ToList(), null);
                var pipe1_result = calc_pipe1_helper.CalcKeepStatus(_open_machine_IdList);
@@ -167,8 +164,8 @@
                calc_pipe2_helper.InitialParas(
                    pipe2_TargetFlow,
                    water_level,
                    pipe2_TargetPess,
                    water_level,true ,
                    pipe2_TargetPess,false ,
                    null, null,
                    (from x in allMachineList where pipe2_machineIds.Contains(x.MachineID) select x).ToList(), null);