Merge branch 'MIMO_PLUS_NV' of http://106.15.194.121:8083/liutao/1069_MIMO_PlUS into MIMO_PLUS_NV

Common/Setting_Init.cs

@@ -151,6 +151,8 @@ namespace OnlineStore.Common
         public static MyConfig<bool> Disable_SingleDoor = false;
         [MyConfigComment("屏蔽料串门")]
         public static MyConfig<bool> Disable_StringDoor = false;
+        [MyConfigComment("屏蔽光栅")]
+        public static MyConfig<bool> Disable_SafetyLightCurtains = false;
         [MyConfigComment("关闭日志窗口")]
         public static MyConfig<bool> Disable_LogWindow = true;
         [MyConfigComment("屏蔽门安全检查")]

DeviceLibrary/DeviceLibrary/IOManager.cs

@@ -39,6 +39,13 @@ namespace DeviceLibrary
             IO_VALUE ioValue = IO_VALUE.LOW;
             if (StoreManager.Config.DIList.ContainsKey(ioType))
             {
+                if (IO_Type.SafetyLightCurtains.Equals(ioType))
+                {
+                    if (Setting_Init.Disable_SafetyLightCurtains)
+                    {
+                        return IO_VALUE.HIGH;
+                    }
+                }
                 ConfigIO configIo = StoreManager.Config.DIList[ioType];
                 ioValue = instance.GetDIValue(configIo.DeviceName, configIo.SlaveID, configIo.GetIOAddr());
                 //UpdateDoValue(ioType, ioValue);

TheMachineNView/TheMachineNView.csproj

@@ -89,7 +89,7 @@
     <Reference Include="System.Xml" />
     <Reference Include="UserFromControl, Version=1.0.7440.17371, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>bin\Debug\UserFromControl.dll</HintPath>
+      <HintPath>..\DLL\UserFromControl.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>