如果是入料三入库，且进仓19，进仓20需要空托盘，先放托盘经过

source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs

@@ -1680,7 +1680,7 @@ namespace OnlineStore.DeviceLibrary
                             MoveInfo.MoveStep.Equals(LineMoveStep.FI_21_CylinderGive))
                             MoveInfo.MoveStep.Equals(LineMoveStep.FI_21_CylinderGive))
                         //if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_25_WaitTray) && MoveInfo.IsInWait.Equals(false))
                         //if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_25_WaitTray) && MoveInfo.IsInWait.Equals(false))
                         {
                         {
-
+                             
                             if (!MoveInfo.MoveStep.Equals(LineMoveStep.FI_25_WaitTray))
                             if (!MoveInfo.MoveStep.Equals(LineMoveStep.FI_25_WaitTray))
                             {
                             {
                                 //如果报警直接离开
                                 //如果报警直接离开
@@ -1771,7 +1771,21 @@ namespace OnlineStore.DeviceLibrary
                     {
                     {
                         return true;
                         return true;
                     }
                     }
+                }  //如果是入料三入库，且进仓19，进仓20需要空托盘，先放托盘经过
+                if (DeviceID.Equals(103))
+                {
+                    MoveEquip moveEquip19 = LineManager.Line.GetMoveByDId(19);
+                    if (moveEquip19.IsWaitEmptyTray())
+                    {
+                        return true;
+                    }
+                    MoveEquip moveEquip20 = LineManager.Line.GetMoveByDId(20);
+                    if (moveEquip20.IsWaitEmptyTray())
+                    {
+                        return true;
+                    }
                 }
                 }
+
             }
             }
             catch (Exception ex)
             catch (Exception ex)
             {
             {