获取库位号时不判断是否有出库任务。

source/DeviceLibrary/assemblyLine/LineBean_Partial.cs

@@ -1159,18 +1159,23 @@ namespace OnlineStore.DeviceLibrary
                 return false;
             }
             MoveEquip move = MoveEquipMap[id];
-            if (!move.NoAlarm() || move.IsDebug || move.waitOutStoreList.Count > 0)
+            if (move.IsDebug)
+            //if (!move.NoErrorAlarm() || move.IsDebug || move.waitOutStoreList.Count > 0)
             {
                 return false;
             }
-            if (runStatus.Equals(LineRunStatus.Runing) || runStatus.Equals(LineRunStatus.Busy))
+            if (runStatus > LineRunStatus.Wait && move.runStatus > LineRunStatus.Wait)
             {
-                if ((move.MoveInfo.MoveType.Equals(LineMoveType.None) || move.MoveInfo.MoveType.Equals(LineMoveType.InStore))
-                    && (move.runStatus.Equals(LineRunStatus.Runing) || move.runStatus.Equals(LineRunStatus.Busy)))
-                {
-                    return true;
-                }
+                return true;
             }
+            //if (runStatus.Equals(LineRunStatus.Runing) || runStatus.Equals(LineRunStatus.Busy))
+            //{
+            //    if ((move.MoveInfo.MoveType.Equals(LineMoveType.None) || move.MoveInfo.MoveType.Equals(LineMoveType.InStore))
+            //        && (move.runStatus.Equals(LineRunStatus.Runing) || move.runStatus.Equals(LineRunStatus.Busy)))
+            //    {
+            //        return true;
+            //    }
+            //}
             //  LogUtil.error("runStatus【" + runStatus + "】，move.MoveInfo.MoveType【" + move.MoveInfo.MoveType + "】，move.runStatus【" + move.runStatus + "】 ");
             return false;
         }

source/DeviceLibrary/assemblyLine/LineBean_Shunt.cs

@@ -90,12 +90,15 @@ namespace OnlineStore.DeviceLibrary
         private bool Shunt_Updown2CanUp()
         {
             TimeSpan span = DateTime.Now - Stop2DownTime;
-            if (span.TotalMilliseconds >= 3000)
+            if (span.TotalMilliseconds >= 4000)
             {
                 if (IOValue(IO_Type.Shunt_StopDown2_Back).Equals(IO_VALUE.LOW)
                     && IOValue(IO_Type.Shunt_Check3_Back).Equals(IO_VALUE.LOW))
                 {
-                    return true;
+                    if (TrayManager.checkWatch(check3LowWatch, 200, false))
+                    {
+                        return true;
+                    }
                 }
             }
             return false;
@@ -127,7 +130,8 @@ namespace OnlineStore.DeviceLibrary
             CylinderMove(null, IO_Type.Shunt_TopCylinder_Up1, IO_Type.Shunt_TopCylinder_Down1);
             CylinderMove(null, IO_Type.Shunt_TopCylinder_Up2, IO_Type.Shunt_TopCylinder_Down2);
         }
-         
+
+        private Stopwatch check3LowWatch = new Stopwatch();
         private void ShuntTimerProcess()
         {
             if (DisableShunt)
@@ -149,6 +153,16 @@ namespace OnlineStore.DeviceLibrary
                     return;
                 }
 
+                if (IOValue(IO_Type.Shunt_Check3_Back).Equals(IO_VALUE.LOW))
+                {
+                    TrayManager.checkWatch(check3LowWatch, 30000, false);
+                }
+                else
+                {
+                    check3LowWatch.Stop();
+                }
+
+
                 if (Shunt_MoveInfo.MoveType.Equals(LineMoveType.None))
                 {
                     if (IOValue(IO_Type.Shunt_Check1_Front).Equals(IO_VALUE.HIGH)&& IOValue(IO_Type.Shunt_Check2_Middle).Equals(IO_VALUE.HIGH))
@@ -227,8 +241,8 @@ namespace OnlineStore.DeviceLibrary
                     CylinderMove(Shunt_MoveInfo, IO_Type.Shunt_TopCylinder_Down1, IO_Type.Shunt_TopCylinder_Up1);
                     if (Shunt_Updown2CanUp())
                     {
-                        CylinderMove(null, IO_Type.Shunt_TopCylinder_Down2, IO_Type.Shunt_TopCylinder_Up2);
-                        Shunt_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Shunt_TopCylinder_Down2, IO_VALUE.LOW));
+                        CylinderMove(Shunt_MoveInfo, IO_Type.Shunt_TopCylinder_Down2, IO_Type.Shunt_TopCylinder_Up2);
+                        //Shunt_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Shunt_TopCylinder_Down2, IO_VALUE.LOW));
                     }
                 }
                 else
@@ -236,7 +250,7 @@ namespace OnlineStore.DeviceLibrary
                     Shunt_MoveInfo.NextMoveStep(LineMoveStep.Shunt02_Stop1Down);
                     LogUtil.info(Name + "[" + ShuntTrayNum + "]" + "分流横移： 不需要分流，直接放行，Shunt_StopDown1_Front 下降1200   ");
                     IOMove(IO_Type.Shunt_StopDown1_Front, IO_VALUE.HIGH, 1200);
-                } 
+                }
             }
             else if (Shunt_MoveInfo.MoveStep.Equals(LineMoveStep.Shunt02_Stop1Down))
             {
@@ -252,17 +266,20 @@ namespace OnlineStore.DeviceLibrary
 
             else if (Shunt_MoveInfo.MoveStep.Equals(LineMoveStep.Shunt05_Top1Up))
             {
-                if (CylinderIsOk(IO_Type.Shunt_TopCylinder_Down1, IO_Type.Shunt_TopCylinder_Up1) &&
-                    IOValue(IO_Type.Shunt_TopCylinder_Down2).Equals(IO_VALUE.LOW))
-                {
-                    Shunt08_DriveMotorMove();
-                }
-                else if (Shunt_Updown2CanUp())
+                if (Shunt_Updown2CanUp())
                 {
-                    Shunt_MoveInfo.NextMoveStep(LineMoveStep.Shunt07_Top2Up);
-                    ShuntLog("分流横移：升降2开始上升  ");
-                    CylinderMove(null, IO_Type.Shunt_TopCylinder_Down2, IO_Type.Shunt_TopCylinder_Up2);
-                    Shunt_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Shunt_TopCylinder_Down2, IO_VALUE.LOW));
+                    if (CylinderIsOk(IO_Type.Shunt_TopCylinder_Down1, IO_Type.Shunt_TopCylinder_Up1) &&
+                  CylinderIsOk(IO_Type.Shunt_TopCylinder_Down2, IO_Type.Shunt_TopCylinder_Up2))
+                    {
+                        Shunt08_DriveMotorMove();
+                    }
+                    else
+                    {
+                        Shunt_MoveInfo.NextMoveStep(LineMoveStep.Shunt07_Top2Up);
+                        ShuntLog("分流横移：升降2开始上升  ");
+                        CylinderMove(Shunt_MoveInfo, IO_Type.Shunt_TopCylinder_Down2, IO_Type.Shunt_TopCylinder_Up2);
+                        //Shunt_MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Shunt_TopCylinder_Down2, IO_VALUE.LOW));
+                    }
                 }
                 else if (Shunt_MoveInfo.IsTimeOut(120))
                 {