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

source/AssemblyLineClient/useControl/AxisMoveControl.Designer.cs

@@ -129,9 +129,9 @@
             this.groupAxis.Controls.Add(this.btnAxisVMove);
             this.groupAxis.Controls.Add(this.btnReadPosition);
             this.groupAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.groupAxis.Location = new System.Drawing.Point(9, 4);
+            this.groupAxis.Location = new System.Drawing.Point(4, 3);
             this.groupAxis.Name = "groupAxis";
-            this.groupAxis.Size = new System.Drawing.Size(716, 420);
+            this.groupAxis.Size = new System.Drawing.Size(717, 420);
             this.groupAxis.TabIndex = 218;
             this.groupAxis.TabStop = false;
             this.groupAxis.Text = "伺服运动";
@@ -1051,7 +1051,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.Controls.Add(this.groupAxis);
             this.Name = "AxisMoveControl";
-            this.Size = new System.Drawing.Size(731, 428);
+            this.Size = new System.Drawing.Size(726, 428);
             this.Load += new System.EventHandler(this.AxisMoveControl_Load);
             this.groupAxis.ResumeLayout(false);
             this.groupAxis.PerformLayout();

source/DeviceLibrary/assemblyLine/FeedingEquip.cs

@@ -903,10 +903,25 @@ namespace OnlineStore.DeviceLibrary
                         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;
                             }
+                            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);
                     }
@@ -1016,7 +1031,7 @@ namespace OnlineStore.DeviceLibrary
                         IOMove(stopDo, IO_VALUE.LOW);
                         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);
 
                         ProcessShelfOut = false;
@@ -1088,9 +1103,9 @@ namespace OnlineStore.DeviceLibrary
                             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);
                         ProcessShelfEnter = false;
                         LogUtil.info(logName + "   结束");