1

DeviceLibrary/DeviceLibrary/ServerCommunication.cs

@@ -45,41 +45,34 @@ namespace DeviceLibrary
         int lockerrtime = 0;
         private void ServerConnectTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
         {
-            //if (!Monitor.TryEnter(serverConnectTimer))
-            //{
-            //    LogUtil.error("ServerConnectTimer_Elapsed locked");
-            //    lockerrtime++;
-            //    if (lockerrtime > 3)
-            //    {
-            //        lockerrtime = 0;
-            //        Monitor.Exit(serverConnectTimer);
-            //    }
-            //    return;
-            //}
-            try
+            if (!Monitor.TryEnter(serverConnectTimer))
             {
-                if (!server.StartsWith("http"))
-                    return;
-                if (!RobotManage.isRunning)
-                    ProcessMsg(Msg.msg);
-                SendLineStatus();
-            }
-            catch (Exception ex)
-            {
-                LogUtil.info($"ServerConnectTimer_Elapsed:{ex}");
-            }
-            finally
-            {
-                //Monitor.Exit(serverConnectTimer);
+                try
+                {
+                    if (!server.StartsWith("http"))
+                        return;
+                    if (!RobotManage.isRunning)
+                        ProcessMsg(Msg.msg);
+                    SendLineStatus();
+                }
+                catch (Exception ex)
+                {
+                    LogUtil.info($"ServerConnectTimer_Elapsed:{ex}");
+                }
+                finally
+                {
+                    Monitor.Exit(serverConnectTimer);
+                }
             }
+
         }
         public void StartConnectServer()
         {
-            //serverConnectTimer.Enabled = true;
+            serverConnectTimer.Enabled = true;
         }
         public void StopConnectServer()
         {
-            //serverConnectTimer.Enabled = false;
+            serverConnectTimer.Enabled = false;
         }
 
         public void ProcessMsg(List<Msg> msg)
@@ -468,13 +461,9 @@ namespace DeviceLibrary
             {
                 map[ParamDefine.singleReelIn] = ParamDefine.enable;
             }
-            map.Add(ParamDefine.SendEmptyShelf, ParamDefine.disable);
-            map.Add(ParamDefine.SendFullShelf, ParamDefine.disable);
-            map.Add(ParamDefine.NeedEmptySHelf, ParamDefine.disable);
-            map.Add(ParamDefine.NeedFullShelf, ParamDefine.disable);
             if (RobotManage.mainMachine?.StringState == MainMachine.StringStateE.None)
             {
-                map[ParamDefine.NeedEmptySHelf] = ParamDefine.enable;
+                //map[ParamDefine.NeedEmptySHelf] = ParamDefine.enable;
                 map[ParamDefine.NeedFullShelf] = ParamDefine.enable;
             }
             if (RobotManage.mainMachine?.StringMoveInfo.MoveStep == MoveStep.StringOut_Released)

DeviceLibrary/theMachine/MainMachine_String.cs

@@ -134,6 +134,8 @@ namespace DeviceLibrary
                     {
                         StringMoveInfo.NextMoveStep(MoveStep.StringLoad_02a);
                         StringMoveInfo.log($"顶起料串固定顶升");
+                        //if (!ConfigHelper.Config.Get("Device_Disable_StringDoor", false))
+                        //    StringDoorClose(StringMoveInfo);
                         CylinderMove(StringMoveInfo, IO_Type.StringFix_Bottom, IO_Type.StringFix_Top, IO_VALUE.HIGH);
                         CylinderMove(StringMoveInfo, IO_Type.StringPosChecker_Home, IO_Type.StringPosChecker_Work, IO_VALUE.HIGH);
                     }
@@ -395,7 +397,11 @@ namespace DeviceLibrary
                 case MoveStep.StringOut_Released:
                     ServerCM.storeStatus = StoreStatus.StoreOnline;
                     if (StringState == StringStateE.Full)
-                        Msg.add(crc.GetString(L.string_full_takeout, "料串已满请取出"), MsgLevel.warning);//0427
+                    {
+                        //if (ConfigHelper.Config.Get("OpenStringDoorAfterOutStoreEnd", true))
+                        //    StringDoorOpen(StringMoveInfo);
+                        Msg.add(crc.GetString(L.string_full_takeout, "料串已满请取出"), MsgLevel.warning);//0427 
+                    }
                     else
                         Msg.add(crc.GetString(L.wait_string_take, "等待料串被取走"), MsgLevel.warning);
                     if (IOValue(IO_Type.StringBack_Check).Equals(IO_VALUE.LOW) && IOValue(IO_Type.StringFront_Check).Equals(IO_VALUE.LOW))