料仓25,26在等待空托盘时，入料2不拦截空托盘

source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs

@@ -1772,33 +1772,46 @@ namespace OnlineStore.DeviceLibrary
         {
         {
             try
             try
             {
             {
+                List<int> moveIds = new List<int>() { };
                 if (DeviceID.Equals(102))
                 if (DeviceID.Equals(102))
                 {
                 {
-                    MoveEquip moveEquip7 = LineManager.Line.GetMoveByDId(7);
-                    if (moveEquip7.IsWaitEmptyTray())
+                    moveIds = new List<int>() { 7, 8, 19, 20 }; 
+                    //MoveEquip moveEquip7 = LineManager.Line.GetMoveByDId(7);
+                    //if (moveEquip7.IsWaitEmptyTray())
+                    //{
+                    //    return true;
+                    //}
+                    //MoveEquip moveEquip8 = LineManager.Line.GetMoveByDId(8);
+                    //if (moveEquip8.IsWaitEmptyTray())
+                    //{
+                    //    return true;
+                    //}
+                }  //如果是入料三入库，且进仓19，进仓20需要空托盘，先放托盘经过
+                if (DeviceID.Equals(103))
                 {
                 {
-                        return true;
+                    moveIds = new List<int>() { 19, 20 };
+                    //MoveEquip moveEquip19 = LineManager.Line.GetMoveByDId(19);
+                    //if (moveEquip19.IsWaitEmptyTray())
+                    //{
+                    //    return true;
+                    //}
+                    //MoveEquip moveEquip20 = LineManager.Line.GetMoveByDId(20);
+                    //if (moveEquip20.IsWaitEmptyTray())
+                    //{
+                    //    return true;
+                    //}
                 }
                 }
-                    MoveEquip moveEquip8 = LineManager.Line.GetMoveByDId(8);
-                    if (moveEquip8.IsWaitEmptyTray())
+                if (moveIds.Count > 0)
                 {
                 {
-                        return true;
-                    }
-                }  //如果是入料三入库，且进仓19，进仓20需要空托盘，先放托盘经过
-                if (DeviceID.Equals(103))
+                    foreach (int id in moveIds)
                     {
                     {
-                    MoveEquip moveEquip19 = LineManager.Line.GetMoveByDId(19);
-                    if (moveEquip19.IsWaitEmptyTray())
+                        MoveEquip moveEquip = LineManager.Line.GetMoveByDId(id);
+                        if (moveEquip != null && moveEquip.IsWaitEmptyTray())
                         {
                         {
                             return true;
                             return true;
                         }
                         }
-                    MoveEquip moveEquip20 = LineManager.Line.GetMoveByDId(20);
-                    if (moveEquip20.IsWaitEmptyTray())
-                    {
-                        return true;
                     }
                     }
                 } 
                 } 
-
             }
             }
             catch (Exception ex)
             catch (Exception ex)
             {
             {