From 05f522e321a742f03bf1e3e26edaeb5147da42f4 Mon Sep 17 00:00:00 2001
From: tangxu <76880903@qq.com>
Date: 星期三, 02 十一月 2022 16:18:47 +0800
Subject: [PATCH] 解决南汇北 计划计算

---
 Calculation/IStation.Calculation.Dispatch/custom/shys/station/南汇北/OptAna.cs |   29 ++++++++++++-----------------
 1 files changed, 12 insertions(+), 17 deletions(-)

diff --git "a/Calculation/IStation.Calculation.Dispatch/custom/shys/station/\345\215\227\346\261\207\345\214\227/OptAna.cs" "b/Calculation/IStation.Calculation.Dispatch/custom/shys/station/\345\215\227\346\261\207\345\214\227/OptAna.cs"
index a38c577..9e7afa2 100644
--- "a/Calculation/IStation.Calculation.Dispatch/custom/shys/station/\345\215\227\346\261\207\345\214\227/OptAna.cs"
+++ "b/Calculation/IStation.Calculation.Dispatch/custom/shys/station/\345\215\227\346\261\207\345\214\227/OptAna.cs"
@@ -117,7 +117,7 @@
                     inlet_press = complex_request_paras.InletPipePara[0].Value;
                 }
             }
-            double water_level = inlet_press * 102;
+ 
 
 
             //鏈烘车淇℃伅
@@ -132,26 +132,21 @@
                 }
             }
 
- 
-   
+            double outlet_press = (pipe1_TargetPess + pipe2_TargetPess) / 2;
 
-            Common.DispatchAnaGeneralHelper鍘嬪姏 calc_pipe1_helper =
-     new Common.DispatchAnaGeneralHelper鍘嬪姏();
 
- 
 
- 
-                calc_pipe1_helper.InitialParas(
-                    pipe1_TargetFlow + pipe2_TargetFlow,
-                    water_level,true ,
-                    (pipe1_TargetPess + pipe2_TargetPess) / 2,false ,
-                    null, null,
-                    _allMachineList,
-                    machine_run_status == null ? null : machine_run_status.MachineRunFilter);
+            Common.DispatchAnaGeneralHelper鍘嬪姏 calc_pipe1_helper =  new Common.DispatchAnaGeneralHelper鍘嬪姏();
 
-                return calc_pipe1_helper.CalcOptList(complex_request_paras.SchemeSortType, 3);
-           
- 
+            calc_pipe1_helper.InitialParas(
+                pipe1_TargetFlow + pipe2_TargetFlow,
+                inlet_press, false,
+                outlet_press, false,
+                null, null,
+                _allMachineList,
+                machine_run_status == null ? null : machine_run_status.MachineRunFilter);
+
+            return calc_pipe1_helper.CalcOptList(complex_request_paras.SchemeSortType, 3);
         }
 
 

--
Gitblit v1.9.3