皮带线优化。料仓78出库时上料2放空托盘过去。

source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs

@@ -1495,6 +1495,13 @@ namespace OnlineStore.DeviceLibrary
                         if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_24_WaitTray) && MoveInfo.IsInWait.Equals(false))
                         //if (MoveInfo.MoveStep >= LineMoveStep.FI_11_CylinderUp && MoveInfo.MoveStep <= LineMoveStep.FI_20_WaitTray)
                         {
+
+                            if (NeedEmptyTrayGo())
+                            {
+                                LogUtil.info(Name + "拦截到空托盘【" + trayNum + "】，后续料仓需要空托盘，放行托盘");
+                                return false;
+                            }
+
                             if (NeedSaveParam)
                             {
                                 CheckParam = param;
@@ -1517,6 +1524,31 @@ namespace OnlineStore.DeviceLibrary
             return false;
         }
 
+        private bool NeedEmptyTrayGo()
+        {
+            try
+            {
+                if (DeviceID.Equals(102))
+                {
+                    MoveEquip moveEquip7 = LineManager.Line.MoveEquipMap[7];
+                    if (moveEquip7.IsWaitEmptyTray())
+                    {
+                        return true;
+                    }
+                    MoveEquip moveEquip8 = LineManager.Line.MoveEquipMap[8];
+                    if (moveEquip8.IsWaitEmptyTray())
+                    {
+                        return true;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                LogUtil.error("NeedEmptyTrayGo出错：" + ex.ToString());
+            }
+            return false;
+        }
+
         #endregion
 
     }

source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs

@@ -451,6 +451,21 @@ namespace OnlineStore.DeviceLibrary
             }
             return false;
         }
+
+        internal bool IsWaitEmptyTray()
+        {
+            if (isInSuddenDown || isNoAirCheck)
+            {
+                return false;
+            }
+            bool moveOk = (IsBigStore() && MoveInfo.MoveStep >= LineMoveStep.MO_55_CylinderUp) || MoveInfo.MoveStep >= LineMoveStep.MO_56_CylinderAfter;
+            if (MoveInfo.MoveType.Equals(LineMoveType.OutStore) && moveOk
+                 && (!MoveInfo.MoveStep.Equals(LineMoveStep.MO_60_CylinderUp)))
+            {
+                return true ;
+            }
+            return false;
+        }
         /// <summary>
         /// 判断盘号是否需要入库
         /// </summary>

source/DeviceLibrary/assemblyLine/ProvidingEquip_Partial.cs

@@ -246,26 +246,39 @@ namespace OnlineStore.DeviceLibrary
                 else
                 {
                     //空闲且皮带线出料已结束 
-                    if (kongxian && LineNotBusy())
+                    if (kongxian )
                     {
                         //随机分配
-                        Random r = new Random();
-                        int value = r.Next(1, 7) % 6;
+                        //Random r = new Random();
+                        //int value = r.Next(1, 7) % 6;
 
-                        if (lineNum.Equals(1))
+                        //if (lineNum.Equals(1))
+                        //{
+                        //    if ((value.Equals(0) || value.Equals(1)) || value.Equals(2) || value.Equals(3))
+                        //    {
+                        //        outMsg = "随意放" + value;
+                        //        return inoup;
+                        //    }
+                        //}
+                        //else if (lineNum.Equals(2))
+                        //{
+                        //    if (value.Equals(3) || value.Equals(4) || value.Equals(5))
+                        //    {
+                        //        outMsg = "随意放" + value;
+                        //        return inoup;
+                        //    }
+                        //}
+                        if (lineNum.Equals(1) || lineNum.Equals(2))
                         {
-                            if ((value.Equals(0) || value.Equals(1)) || value.Equals(2) || value.Equals(3))
+                            if (LastValue.Equals(0))
                             {
-                                outMsg = "随意放" + value;
+                                outMsg = "随意放" + LastValue;
+                                LastValue = 1;
                                 return inoup;
                             }
-                        }
-                        else if (lineNum.Equals(2))
-                        {
-                            if (value.Equals(3) || value.Equals(4) || value.Equals(5))
+                            else
                             {
-                                outMsg = "随意放" + value;
-                                return inoup;
+                                LastValue = 0;
                             }
                         }
                         else
@@ -280,6 +293,7 @@ namespace OnlineStore.DeviceLibrary
             //TODO 判断是否是需要移栽出料的料盘
             return null;
         }
+        private int LastValue = 0;
         protected override void CheckFixtureProcess()
         {
             if (!LineManager.Line.LineCanRun())