needEnter级别修改。finishEnter和finishLeave持续时间修改。

source/DeviceLibrary/assemblyLine/FeedingEquip.cs

@@ -449,11 +449,25 @@ namespace OnlineStore.DeviceLibrary
                         ClientLevel level = ClientLevel.Low;
                         ClientLevel level = ClientLevel.Low;
                         if (Config.IsCanOut.Equals(1))
                         if (Config.IsCanOut.Equals(1))
                         {
                         {
-                            //如果是出料模块且当前无料架
-                            if (IOValue(IO_Type.SL_Location_Check).Equals(IO_VALUE.LOW) && MoveInfo.MoveType.Equals(LineMoveType.None))
+                            if (IOValue(IO_Type.SL_Stop_Check).Equals(IO_VALUE.LOW) && IOValue(IO_Type.SL_Location_Check).Equals(IO_VALUE.LOW) && MoveInfo.MoveType.Equals(LineMoveType.None))
                             {
                             {
                                 level = ClientLevel.High;
                                 level = ClientLevel.High;
                             }
                             }
+                            else if (IOValue(IO_Type.SL_Stop_Check).Equals(IO_VALUE.LOW) && IOValue(IO_Type.SL_Location_Check).Equals(IO_VALUE.HIGH))
+                            {
+                                level = ClientLevel.Middle;
+                            }
+                        }
+                        else
+                        {
+                            if (IOValue(IO_Type.SL_Stop_Check).Equals(IO_VALUE.LOW) && IOValue(IO_Type.SL_Location_Check).Equals(IO_VALUE.LOW) && MoveInfo.MoveType.Equals(LineMoveType.None))
+                            {
+                                level = ClientLevel.High;
+                            }
+                            else if (IOValue(IO_Type.SL_Stop_Check).Equals(IO_VALUE.LOW) && IOValue(IO_Type.SL_Location_Check).Equals(IO_VALUE.HIGH))
+                            {
+                                level = ClientLevel.Middle;
+                            }
                         }
                         }
                         AgvClient.NeedEnter(Config.AgvInName, "", level);
                         AgvClient.NeedEnter(Config.AgvInName, "", level);
                     }
                     }
@@ -764,7 +778,7 @@ namespace OnlineStore.DeviceLibrary
                         IOMove(IO_Type.SL_Out_StopDown, IO_VALUE.LOW);
                         IOMove(IO_Type.SL_Out_StopDown, IO_VALUE.LOW);
                         AgvClient.SetStatus(Config.AgvOutName, LastOutShelfId, ClientAction.FinishLeave, ClientLevel.High, true);
                         AgvClient.SetStatus(Config.AgvOutName, LastOutShelfId, ClientAction.FinishLeave, ClientLevel.High, true);
 
 
-                        Thread.Sleep(1000);
+                        Thread.Sleep(5000);
                         AgvClient.SetStatus(Config.AgvOutName, "", ClientAction.None, ClientLevel.High, true);
                         AgvClient.SetStatus(Config.AgvOutName, "", ClientAction.None, ClientLevel.High, true);
 
 
                         ProcessShelfOut = false;
                         ProcessShelfOut = false;
@@ -837,9 +851,9 @@ namespace OnlineStore.DeviceLibrary
                             IOMove(IO_Type.SL_Line_Run, IO_VALUE.LOW);
                             IOMove(IO_Type.SL_Line_Run, IO_VALUE.LOW);
                         }
                         }
                         //料架可离开
                         //料架可离开
-                        //AgvClient.SetStatus(Config.AgvInName, "", ClientAction.FinishEnter, ClientLevel.High, true);  
+                        AgvClient.SetStatus(Config.AgvInName, "", ClientAction.FinishEnter, ClientLevel.High, true);  
 
 
-                        Thread.Sleep(1000);
+                        Thread.Sleep(5000);
                         AgvClient.SetStatus(Config.AgvInName, "", ClientAction.None, ClientLevel.High, true);
                         AgvClient.SetStatus(Config.AgvInName, "", ClientAction.None, ClientLevel.High, true);
                         ProcessShelfEnter = false;
                         ProcessShelfEnter = false;
                         LogUtil.info(logName + "   结束");
                         LogUtil.info(logName + "   结束");