1.入料线阻挡下降1.5秒。

2.T3,T4 料架送出时，若出口有料架，出料线转动5秒
3.料仓离线改为3秒

source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs

@@ -175,7 +175,7 @@ namespace OnlineStore.DeviceLibrary
                 MoveInfo.NextMoveStep(LineMoveStep.FI_05_LineStart);
                 InLog("入料检测： " + MoveInfo.SLog + "   阻挡工位有新料架，清理缓存料架RFID ，进料阻挡下降500，缓冲阻挡前进1000，流水线转动 1000");
                 UpdateLastShelfID();
-                IOMove(IO_Type.SL_Entry_StopDown, IO_VALUE.HIGH, 500);//进料阻挡下降
+                IOMove(IO_Type.SL_Entry_StopDown, IO_VALUE.HIGH, 1500);//进料阻挡下降
                 IOMove(IO_Type.SL_Buffer_StopDown, IO_VALUE.HIGH, 1000);//缓冲阻挡前进1000
                 //  IOMove(IO_Type.SL_Buffer_StopDown, IO_VALUE.LOW);//缓冲阻挡下降
                 IOMove(IO_Type.SL_Line_Run, IO_VALUE.HIGH);
@@ -626,11 +626,24 @@ namespace OnlineStore.DeviceLibrary
             }
             else if (MoveInfo.IsStep(LineMoveStep.FI_54_FixedUp))
             {
+                if (IOValue(IO_Type.SL_Out_Check).Equals(IO_VALUE.HIGH) && HasOutLine)
+                {
+                    MoveInfo.NextMoveStep(LineMoveStep.FI_55_OutCheck);
+                    InLog("送出料串： " + MoveInfo.SLog + "，出料线体转动5秒，等待出料线体无料架，");
+                    IOMove(IO_Type.SL_Out_StopDown, IO_VALUE.LOW);
+                    IOMove(IO_Type.SL_OutLine_Run, IO_VALUE.HIGH);
+                    MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(5000));
+                    MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Out_Check, IO_VALUE.LOW));
+                    MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Out_StopDown, IO_VALUE.LOW));
+                }
+                else
+                {
                     MoveInfo.NextMoveStep(LineMoveStep.FI_55_OutCheck);
                     InLog("上料完成" + MoveInfo.SLog + "，等待出料线体无料架");
                     MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Out_Check, IO_VALUE.LOW));
                     MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Out_StopDown, IO_VALUE.LOW));
                 }
+            }
             else if (MoveInfo.IsStep(LineMoveStep.FI_55_OutCheck))
             {
                 if (!ProcessShelfOut)

source/DeviceLibrary/assemblyLine/FeedingEquip_OutStore.cs

@@ -229,7 +229,7 @@ namespace OnlineStore.DeviceLibrary
                 MoveInfo.NextMoveStep(LineMoveStep.FO_05_LineStart);
                 OutLog("准备出库料架： " + MoveInfo.SLog + "   阻挡工位有新料架，清理缓存料架RFID，进料阻挡下降500ms，缓冲阻挡前进1000，流水线转动 5000");
                 UpdateLastShelfID();
-                IOMove(IO_Type.SL_Entry_StopDown, IO_VALUE.HIGH, 500);
+                IOMove(IO_Type.SL_Entry_StopDown, IO_VALUE.HIGH, 1500);
                 IOMove(IO_Type.SL_Buffer_StopDown, IO_VALUE.HIGH, 1000);//缓冲阻挡前进1000
                 IOMove(IO_Type.SL_Line_Run, IO_VALUE.HIGH);
                 //等待指定时间
@@ -447,10 +447,22 @@ namespace OnlineStore.DeviceLibrary
             }
             else if (MoveInfo.IsStep(LineMoveStep.FO_54_FixedUp))
             {
+                if (IOValue(IO_Type.SL_Out_Check).Equals(IO_VALUE.HIGH) && HasOutLine)
+                {
+                    MoveInfo.NextMoveStep(LineMoveStep.FO_55_OutCheck);
+                    OutLog("送出料串： " + MoveInfo.SLog + "，出料线体转动5秒，等待出料线体无料架，");
+                    IOMove(IO_Type.SL_Out_StopDown, IO_VALUE.LOW);
+                    IOMove(IO_Type.SL_OutLine_Run, IO_VALUE.HIGH);
+                    MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(5000));
+                    MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Out_Check, IO_VALUE.LOW));
+                }
+                else
+                {
                     MoveInfo.NextMoveStep(LineMoveStep.FO_55_OutCheck);
                     OutLog("送出料串： " + MoveInfo.SLog + "，等待出料线体无料架");
                     MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Out_Check, IO_VALUE.LOW));
                 }
+            }
             else if (MoveInfo.IsStep(LineMoveStep.FO_55_OutCheck))
             {
                 if (!ProcessShelfOut)

source/DeviceLibrary/deviceLibrary/halcon/CodeManager.cs

@@ -293,7 +293,8 @@ namespace OnlineStore.DeviceLibrary
                     string[] strarray = code.Split(';');
                     if (strarray.Length == 4)
                     {
-                        if (strarray[0].StartsWith("L") &&
+                        if (
+                            //strarray[0].StartsWith("L") &&
                             strarray[1].StartsWith("E") &&
                             strarray[2].StartsWith("B"))
                         {

source/DeviceLibrary/server/LineServer.cs

@@ -13,7 +13,7 @@ namespace OnlineStore.DeviceLibrary
     {
         private static TcpServer tcpserver = null;
         public static bool IsStart = false;
-        public  static int ClientKeepSecond = 10;
+        public  static int ClientKeepSecond = 3;
         public static Dictionary<int, BoxInfo> BoxMap = new Dictionary<int, BoxInfo>();
 
         public static Dictionary<int, TcpClientBean> ClientMap = new Dictionary<int, TcpClientBean>();