modify North and south water repel each other function

ModbusDemo/MessageFormat/ModualControl.cs

@@ -195,7 +195,7 @@ namespace ModbusDemo.MessageFormat
                         cModualCntrol.bStartControl = true;
                         for (int j = 0; j < cModualCntrol.strOperationChannelName.Count(); j++)
                         {
-                            if ( bNorth_South_Water_Mutual_Check(cModualCntrol.sbModbusID,cModualCntrol.strOperationChannelName[j]) && ControlMap.bControl_Map(cModualCntrol.bOpenMachine, cModualCntrol.sbModbusID, cModualCntrol.bControlData, cModualCntrol.strOperationChannelName[j]))
+                            if (bNorth_South_Water_Mutual_Check (cModualCntrol.sbModbusID,cModualCntrol.strOperationChannelName[j]) && ControlMap.bControl_Map(cModualCntrol.bOpenMachine, cModualCntrol.sbModbusID, cModualCntrol.bControlData, cModualCntrol.strOperationChannelName[j]))
                             {
                                 bOperationStatus[j] = ControlMap.bDelege_Operation(cModualCntrol.bControlData);
                                 cModualCntrol.bControlStatus = bOperationStatus[j];
@@ -255,7 +255,7 @@ namespace ModbusDemo.MessageFormat
                                 liModuualControl[i].bStartControl = true;
                                 bool[] bControlData;
                                 liModuualControl[i].bControlStatus = ModualPoll.bGet_channel_Value<bool>(liModuualControl[i].sbModbusID, out bControlData, "d0", "d1","d2", "d3", "d4", "d5", "d6", "d7");
-                                if (ControlMap.bControl_Map(liModuualControl[i].bOpenMachine, liModuualControl[i].sbModbusID, liModuualControl[i].bControlData, liModuualControl[i].strOperationChannelName[0]))
+                                if (bNorth_South_Water_Mutual_Check (liModuualControl[i].sbModbusID,liModuualControl[i].strOperationChannelName[0]) && ControlMap.bControl_Map(liModuualControl[i].bOpenMachine, liModuualControl[i].sbModbusID, liModuualControl[i].bControlData, liModuualControl[i].strOperationChannelName[0]))
                                 {
                                     liModuualControl[i].bControlStatus = ControlMap.bDelege_Operation(bControlData);
                                 }
@@ -276,7 +276,7 @@ namespace ModbusDemo.MessageFormat
                                 //        liModuualControl[i].bControlData[j] =  !liModuualControl[i].bControlData[j];
                                 //    }
                                 //}
-                                if (ControlMap.bControl_Map(!liModuualControl[i].bOpenMachine, liModuualControl[i].sbModbusID, liModuualControl[i].bControlData, liModuualControl[i].strOperationChannelName[0]))
+                                if (bNorth_South_Water_Mutual_Check (liModuualControl[i].sbModbusID,liModuualControl[i].strOperationChannelName[0]) && ControlMap.bControl_Map(!liModuualControl[i].bOpenMachine, liModuualControl[i].sbModbusID, liModuualControl[i].bControlData, liModuualControl[i].strOperationChannelName[0]))
                                 {
                                     liModuualControl[i].bControlStatus = ControlMap.bDelege_Operation(bControlData);
                                 }
@@ -515,8 +515,15 @@ namespace ModbusDemo.MessageFormat
         }
         public static bool bOperation_Machine(bool bOpenMachine, byte sbModbusID,bool[] bControlData,bool[] bControlBit,out bool bHadOpenMachine, byte byResModualID,string stResChannel)
         {
-            bHadOpenMachine = true;
             bool bControlStatus = true;
+            if (bOpenMachine == true)
+            {
+                bHadOpenMachine = false;
+            }
+            else
+            {
+                bHadOpenMachine = true;
+            }
             if (ModualPoll.bSet_All_Channel_Value(sbModbusID, bControlData) == true)
             {
                 if (bOpenMachine == true && stResChannel != null)
@@ -556,7 +563,7 @@ namespace ModbusDemo.MessageFormat
             }
             else
             {
-                bControlStatus= false;
+                bControlStatus = false;
             }
             for (int i = 0; i < bControlBit.Count(); i++)
             {
@@ -566,7 +573,7 @@ namespace ModbusDemo.MessageFormat
                     if (bControlStatus == true)
                         ModualAlarm.vSet_Modual_Alarm(sbModbusID, (ushort)ModualAlarm.eAlarmCode.ChannelControlError, false, 1, str);
                     else
-                        ModualAlarm.vSet_Modual_Alarm(sbModbusID,(ushort)ModualAlarm.eAlarmCode.ChannelControlError, true, 1, str);
+                        ModualAlarm.vSet_Modual_Alarm(sbModbusID, (ushort)ModualAlarm.eAlarmCode.ChannelControlError, true, 1, str);
                 }
             }
             ModualPoll.vSend_Actual_Data(sbModbusID);
@@ -704,7 +711,7 @@ namespace ModbusDemo.MessageFormat
                 AllPond.cDischargePool.vSetMinLevel = pcConfig.ReadConfig<double>("出料池配置", "报警最低液位");    
             }
         }
-        public static bool bNorth_South_Water_Mutual_Check(byte byModbusID,  string strOperationChannelsName)
+        public static bool bNorth_South_Water_Mutual_Check(byte byModbusID, string strOperationChannelsName)
         {
             bool bCheckStatus = true;
             if (byModbusID == AllPond.cEastTransitPool.cSouthWater.byModbusID && strOperationChannelsName == AllPond.cEastTransitPool.cSouthWater.strOperationNumber)
@@ -739,9 +746,11 @@ namespace ModbusDemo.MessageFormat
                     bCheckStatus = true;
                 }
             }
-            if (bCheckStatus == false)
+            else
+                bCheckStatus = true;
+            if (bCheckStatus == false )
             { 
-                 ModualPoll.vSend_Actual_Data(byModbusID);
+                ModualPoll.vSend_Actual_Data(byModbusID);
             }
             return bCheckStatus;
         }