1

DeviceLibrary/DeviceLibrary/ServerCommunication.cs

@@ -45,8 +45,8 @@ namespace DeviceLibrary
         int lockerrtime = 0;
         private void ServerConnectTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
         {
-            if (!Monitor.TryEnter(serverConnectTimer))
-            {
+            //if (!Monitor.TryEnter(serverConnectTimer))
+            //{
                 try
                 {
                     if (!server.StartsWith("http"))
@@ -61,9 +61,9 @@ namespace DeviceLibrary
                 }
                 finally
                 {
-                    Monitor.Exit(serverConnectTimer);
-                }
+                    //Monitor.Exit(serverConnectTimer);
                 }
+            //}
 
         }
         public void StartConnectServer()

DeviceLibrary/theMachine/BoxTransport.cs

@@ -114,7 +114,7 @@ namespace DeviceLibrary
                     if (IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
                     {
                         if (!IgnoreX09 && IOMonitor.IODebound(IO_Type.TrayCheck_Fixture, Config, IO_VALUE.HIGH, 5000))
-                            Msg.add(crc.GetString(L.out_store_detect_material, "出库时料叉X30检测到有物料无法继续,请检查."), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
+                            Msg.add(crc.GetString(L.out_store_detect_material, "取料前料叉X30检测到有物料无法继续,请检查."), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
                         //RobotManage.UserPause("出库时料叉X30检测到有物料无法继续,请检查");
                     }
                     else
@@ -174,7 +174,7 @@ namespace DeviceLibrary
                     RobotManage.CameraA.CameraGrabOne(RobotManage.CameraA.GetFixtureStateFilename(From.posid, WareCode, storeMoveType, FixtureState.FromOut));
                     if (!IgnoreX09 && IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.LOW))
                     {
-                        Msg.add(crc.GetString(L.out_store_not_detect_material, "出库时料叉X30没有检测到有物料无法继续,请检查."), MsgLevel.alarm,ErrInfo.X09_BoxNotDetect);
+                        Msg.add(crc.GetString(L.out_store_not_detect_material, "取料前料叉X30没有检测到有物料无法继续,请检查."), MsgLevel.alarm,ErrInfo.X09_BoxNotDetect);
                         //RobotManage.UserPause("出库时料叉X30没有检测到有物料无法继续,请检查");
                     }
                     else
@@ -279,7 +279,7 @@ namespace DeviceLibrary
                     RobotManage.CameraA.CameraGrabOne(RobotManage.CameraA.GetFixtureStateFilename(To.posid, WareCode, storeMoveType, FixtureState.ToOut));
                     if (!IgnoreX09 && IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
                     {
-                        Msg.add(crc.GetString(L.in_store_detect_material,"入库后料叉X30上任然检测到物料,请检查."), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
+                        Msg.add(crc.GetString(L.in_store_detect_material,"放料后料叉X30上任然检测到物料,请检查."), MsgLevel.alarm, ErrInfo.X09_BoxNotDetect);
                         //RobotManage.UserPause("入库后料叉X30上任然检测到物料,请检查");
                     }
                     else