SMEMA修改

DeviceLibrary/deviceLibrary/IO/IOManager.cs

@@ -168,7 +168,7 @@ namespace TSA_V.DeviceLibrary
         #region IO控制方法
         #region IO控制方法
         public static void IOCheckAndMove(string ioType,IO_VALUE ioValue)
         public static void IOCheckAndMove(string ioType,IO_VALUE ioValue)
         {
         {
-            if (!IOValue(ioType).Equals(ioValue))
+            if (!DOValue(ioType).Equals(ioValue))
             {
             {
                 IOMove(ioType, ioValue);
                 IOMove(ioType, ioValue);
             }
             }
@@ -194,7 +194,31 @@ namespace TSA_V.DeviceLibrary
             {
             {
                 LogUtil.error(LOGGER, "KNDIOMove错误ioType=" + ioType + ",value=" + ioValue + ",错误信息：" + ex.ToString());
                 LogUtil.error(LOGGER, "KNDIOMove错误ioType=" + ioType + ",value=" + ioValue + ",错误信息：" + ex.ToString());
             }
             }
-        } 
+        }
+
+        public static IO_VALUE DOValue(string ioType)
+        {
+            //优先验证DO
+            IO_VALUE ioValue = IO_VALUE.LOW;
+            if (DOList.ContainsKey(ioType))
+            {
+                ConfigIO configIo = DOList[ioType];
+                ioValue = IOBase.instance.GetDOValue(configIo.DeviceName, configIo.SlaveID, configIo.IOIndex);
+            }
+            else if (DIList.ContainsKey(ioType))
+            {
+                ConfigIO configIo = DIList[ioType];
+                ioValue = IOBase.instance.GetDIValue(configIo.DeviceName, configIo.SlaveID, configIo.IOIndex); 
+            }
+            else
+            {
+                if (IOBase.NoLine)
+                    return IO_VALUE.LOW;
+                LogUtil.error(LOGGER, "没有DO=" + ioType);
+            }
+            return ioValue;
+        }
+
         public static  IO_VALUE IOValue(string ioType)
         public static  IO_VALUE IOValue(string ioType)
         {
         {
             IO_VALUE ioValue = IO_VALUE.LOW;
             IO_VALUE ioValue = IO_VALUE.LOW;

DeviceLibrary/manager/TSAVBean_Partial.cs

@@ -45,8 +45,9 @@ namespace TSA_V.DeviceLibrary
                 return;
                 return;
             }
             }
             //开始转动
             //开始转动
-            if (IOManager.IOValue(IOManager.SMEMA_Up).Equals(IO_VALUE.HIGH) || (IOManager.IOValue(IOManager.LineInCheck).Equals(IO_VALUE.HIGH) && IOManager.IOValue(IOManager.LineOutCheck).Equals(IO_VALUE.LOW)))
-            {
+            if ( (IOManager.IOValue(IOManager.LineInCheck).Equals(IO_VALUE.HIGH) && IOManager.IOValue(IOManager.LineOutCheck).Equals(IO_VALUE.LOW)))
+            //if (IOManager.IOValue(IOManager.SMEMA_Up).Equals(IO_VALUE.HIGH) || (IOManager.IOValue(IOManager.LineInCheck).Equals(IO_VALUE.HIGH) && IOManager.IOValue(IOManager.LineOutCheck).Equals(IO_VALUE.LOW)))
+                {
                 if (LineStep.moveType.Equals(0))
                 if (LineStep.moveType.Equals(0))
                 {
                 {
                     StartWorkTime = DateTime.Now;
                     StartWorkTime = DateTime.Now;
@@ -67,7 +68,8 @@ namespace TSA_V.DeviceLibrary
                         CylinderReset(true);
                         CylinderReset(true);
                     }
                     }
                 }
                 }
-            } else if (WorkSingleStart||OpenOfflineMode )
+            } 
+            else if (WorkSingleStart||OpenOfflineMode )
             {
             {
                 if (  (IOManager.IOValue(IOManager.LineWorkCheck).Equals(IO_VALUE.HIGH) && IOManager.IOValue(IOManager.LineOutCheck).Equals(IO_VALUE.LOW)))
                 if (  (IOManager.IOValue(IOManager.LineWorkCheck).Equals(IO_VALUE.HIGH) && IOManager.IOValue(IOManager.LineOutCheck).Equals(IO_VALUE.LOW)))
                 {
                 {