进仓5优化

source/DeviceLibrary/assemblyLine/LineBean.cs

@@ -286,6 +286,10 @@ namespace OnlineStore.DeviceLibrary
                     {
                         LogUtil.info(Name + "链条转动超过5秒，先停止链条转动");
                         WriteDrivetMotorRun(IO_VALUE.LOW);
+                        if (!DisableShunt2)
+                        { 
+                            IOMove(IO_Type.Shunt2_StopDown1_Front, IO_VALUE.LOW );
+                        } 
                     }
                     if (runStatus.Equals(LineRunStatus.Wait))
                     {
@@ -365,6 +369,7 @@ namespace OnlineStore.DeviceLibrary
             //分流模块复位
             ShuntStop();
             Shunt2Stop();
+            IOMove(IO_Type.Shunt2_StopDown1_Front, IO_VALUE.HIGH);
             CylinderMove(MoveInfo, IO_Type.Shunt_TopCylinder_Up1, IO_Type.Shunt_TopCylinder_Down1);
             CylinderMove(MoveInfo, IO_Type.Shunt_TopCylinder_Up2, IO_Type.Shunt_TopCylinder_Down2);
             CylinderMove(MoveInfo, IO_Type.Shunt2_TopCylinder_Up1, IO_Type.Shunt2_TopCylinder_Down1);

source/DeviceLibrary/assemblyLine/LineBean_Shunt2.cs

@@ -370,7 +370,7 @@ namespace OnlineStore.DeviceLibrary
                     }
                     else if (storeId >= 15 && storeId <= 18)
                     {
-                        outMsg = "15-18仓入库";
+                        outMsg = storeId+ "仓入库";
                         return true;
                     }
                 }

source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs

@@ -580,9 +580,19 @@ namespace OnlineStore.DeviceLibrary
                 {
                     if (SecondMoveInfo.MoveType.Equals(LineMoveType.None).Equals(false))
                     {
+                        if (IOValue(IO_Type.StopCylinder_Check2).Equals(IO_VALUE.HIGH))
+                        {
+                            trayCheck2LowWait.Stop();
+                        }
+                        else
+                        {
+                            TrayManager.checkWatch(trayCheck2LowWait, 30000, false);
+                        }
                         LogUtil.error(Name + "  StartCheckFixture " + " 不在空闲中，直接返回 ");
                         return;
                     }
+                    if (SecondMoveInfo.MoveType.Equals(LineMoveType.None))
+                    {
                         bool canpro = LineManager.Line.Move5CanProcessTray(DeviceID);
                         if (IOValue(IO_Type.StopCylinder_Check2).Equals(IO_VALUE.HIGH))
                         {
@@ -602,7 +612,7 @@ namespace OnlineStore.DeviceLibrary
                             bool check2IsOk = TrayManager.checkWatch(trayCheck2LowWait, TrayManager.SwTrayWaitTime, false);
                             if (IOValue(IO_Type.StopCylinder_Check1).Equals(IO_VALUE.HIGH))
                             {
-                            if (canpro && TrayManager.checkWatch(trayCheckWait, TrayManager.SwTrayWaitTime, false) && check2IsOk)
+                                if (TrayManager.checkWatch(trayCheckWait, TrayManager.SwTrayWaitTime, false) && check2IsOk && canpro)
                                 {
                                     trayCheckWait.Stop();
                                     trayCheck2LowWait.Stop();
@@ -623,6 +633,7 @@ namespace OnlineStore.DeviceLibrary
                             }
                         }
                     }
+                }
                 catch (Exception ex)
                 {
                     LogUtil.error(Name + "  StartCheckFixture " + " 出错：" + ex.ToString());
@@ -660,7 +671,7 @@ namespace OnlineStore.DeviceLibrary
 
                 if (DeviceID.Equals(5))
                 {
-                    SecondMoveInfo.TimeOutSeconds = 15;
+                    SecondMoveInfo.TimeOutSeconds = 20;
                 }
                 SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check2, IO_VALUE.HIGH));
             }
@@ -829,16 +840,16 @@ namespace OnlineStore.DeviceLibrary
             else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_17_Stop2Check))
             {
                 SecondMoveInfo.NextMoveStep(LineMoveStep.MO_18_WaitTime);
-                CheckLog("托盘放行  " + SecondMoveInfo.SLog + " ， 等待500ms后阻挡2上升");
-                SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
+                CheckLog("托盘放行  " + SecondMoveInfo.SLog + " ， 等待300ms后阻挡2上升");
+                SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(300));
             }
             else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_18_WaitTime))
             {
                 SecondMoveInfo.NextMoveStep(LineMoveStep.MO_19_StopCylinder_Back);
                 CheckLog("托盘放行" + SecondMoveInfo.SLog + " ， 阻挡气缸1-2上升 ）");
                 IOMove(IO_Type.StopCylinder_Down2, IO_VALUE.LOW);
+                SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(100));
                 SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Down2, IO_VALUE.LOW));
-                SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(200));
             }
             else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_19_StopCylinder_Back))
             {