分流横移2bug修改

source/DeviceLibrary/assemblyLine/LineBean_Shunt2.cs

@@ -385,6 +385,8 @@ namespace OnlineStore.DeviceLibrary
                     //必须走皮带线34的料
                     //必须走皮带线34的料
                     else if (inoup.urgentReel.Equals(false) && inoup.cutReel.Equals(false))
                     else if (inoup.urgentReel.Equals(false) && inoup.cutReel.Equals(false))
                     {
                     {
+                        int youxianS = 180;
+                        TimeSpan span = DateTime.Now - trayInfo.LastUpdateTime;
                         if (inoup.smallReel)
                         if (inoup.smallReel)
                         {
                         {
                             if (inoup.rfidLoc >= 70 && inoup.rfidLoc <= 72)
                             if (inoup.rfidLoc >= 70 && inoup.rfidLoc <= 72)
@@ -394,15 +396,27 @@ namespace OnlineStore.DeviceLibrary
                                 outMsg = "出库小料" + inoup.rfidLoc;
                                 outMsg = "出库小料" + inoup.rfidLoc;
                                 return true;
                                 return true;
                             }
                             }
+                            else if (inoup.rfidLoc >= 47)
+                            {
+                                if (span.TotalSeconds < youxianS)
+                                {
+                                    // ,47 - 92优先走3 / 4号皮带线,
+                                    outMsg = "出库小料" + inoup.rfidLoc;
+                                    return true;
+                                }
+                            }
                         }
                         }
                         else
                         else
                         {
                         {
                             //7 - 11优先走3 / 4号皮带线
                             //7 - 11优先走3 / 4号皮带线
-                            if (inoup.rfidLoc >= 7)
+                            if (inoup.rfidLoc >= 7 && inoup.rfidLoc < 12)
                             {
                             {
-                                //firstLine = new List<int> { 3, 4 };
-                                outMsg = "出库大料" + inoup.rfidLoc;
-                                return true;
+                                if (span.TotalSeconds < youxianS)
+                                {
+                                    //firstLine = new List<int> { 3, 4 };
+                                    outMsg = "出库大料" + inoup.rfidLoc;
+                                    return true;
+                                }
                             }
                             }
                         }
                         }
                     }
                     }