merge origin master

a6ed3828 · leon.huang · ff16860c · 5c95addb · a6ed3828
Commit a6ed3828 authored Jun 20, 2019 by leon.huang
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

AutoControl.cs ModbusDemo/application/AutoControl.cs +3 -2

No files found.
--- a/ModbusDemo/application/AutoControl.cs
+++ b/ModbusDemo/application/AutoControl.cs
@@ -348,7 +348,6 @@ namespace ModbusDemo.application
                             "西·中转池",
                             out usWcontrolB
                            );
-                            ModualControl.cPoolLevelConfig.Remove(ModualControl.cPoolLevelConfig[i]);
                        }
                        if (ModualControl.cPoolLevelConfig[i].byModbusID == LevelmodbusID[1])
                        {
@@ -363,10 +362,12 @@ namespace ModbusDemo.application
                        "东·中转池",
                        out usEcontrolB
                        );
-                            ModualControl.cPoolLevelConfig.Remove(ModualControl.cPoolLevelConfig[i]);
+                            
                        }
+                        ModualControl.cPoolLevelConfig.Remove(ModualControl.cPoolLevelConfig[i]);
                    }
                    Automatic_control(usWcontrolB.status, usEcontrolB.status);
+      
                }
                else if (file.Length!= 0)
                {