紧急料分盘料优化

source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs

@@ -431,9 +431,16 @@ namespace OnlineStore.DeviceLibrary
                 {
                     SecondMoveInfo.NextMoveStep(LineMoveStep.MO_201_WaitOutEnd);
                 }
-                else if (MoveInfo.IsTimeOut(180))
+                else if (MoveInfo.IsTimeOut(120))
                 {
-                    WarnMsg = SecondMoveInfo.Name + "[" + SecondMoveInfo.MoveType + "][" + SecondMoveInfo.MoveStep + "] 等待开始紧急出料移栽超时 [" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒";
+                    WarnMsg = SecondMoveInfo.Name + "[" + SecondMoveInfo.MoveStep + "] 等待出库移栽超时 [" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒";
+                    LogUtil.error(WarnMsg + "，暂时放托盘离开");
+                    TrayMoveOk();
+
+                }
+                else if (MoveInfo.IsTimeOut(60))
+                {
+                    WarnMsg = SecondMoveInfo.Name + "[" + SecondMoveInfo.MoveStep + "] 等待出库移栽超时 [" + Math.Round(MoveInfo.StepSpan().TotalSeconds, 1) + "]秒";
                     LogUtil.error(WarnMsg, DeviceID + 11);
                     Alarm(LineAlarmType.IoSingleTimeOut);
                 }
@@ -1287,13 +1294,9 @@ namespace OnlineStore.DeviceLibrary
                     //此托盘是紧急出料盘，需要通过料架出库 
                     bool debugNeed = (runStatus >= LineRunStatus.Runing) && info.IsFull && info.InOrOutStore.Equals(2);
                     debugNeed = false;
-                    //if (param.PosId.Equals(""))
-                    //{
-                    //    param = new InOutParam(trayNum, "紧急出料测试", "1#AC1_3_2", 12, 7);
-                    //}
+
                     bool isJinji = (param.urgentReel || param.cutReel) && info.InOrOutStore.Equals(2) && info.IsFull && runStatus >= LineRunStatus.Runing;
-                    //入料失败的盘也从此处出库
-                    //    bool instoeEnd = (runStatus >= LineRunStatus.Runing) && info.IsFull && info.InStoreNG;
+
                     if (debugNeed || isJinji)
                     {
 
@@ -1301,21 +1304,29 @@ namespace OnlineStore.DeviceLibrary
                         if (IOValue(IO_Type.SL_Location_Check).Equals(IO_VALUE.LOW))
                         {
                             LogUtil.error(Name + " 【" + info.ToStr() + "】需要出库，定位工位无料架，暂不处理", DeviceID + 16);
+                            return false;
                         }
                         else if (OutStoreHeight < 0)
                         {
                             LogUtil.error(Name + " 【" + info.ToStr() + "】需要出库，料架未准备好，暂不处理", DeviceID + 17);
+                            return false;
                         }
-                        else
+
+                        //如果已经开始送出料架，暂不处理
+                        if (MoveInfo.MoveType.Equals(LineMoveType.OutStore)&& MoveInfo.MoveStep >= LineMoveStep.FO_30_BatchAxisToP2)
                         {
-                            if (NeedSaveParam)
-                            {
-                                LogInfo(" 【" + info.ToStr() + "】需要出库 ，拦截托盘 "  );
-                                CheckParam = param;
-                            }
-                            return true;
+                            LogUtil.error(Name + " 【" + info.ToStr() + "】需要出库，正在送出料架，暂不处理", DeviceID + 18);
+                            return false;
                         }
+
+                        if (NeedSaveParam)
+                        {
+                            LogInfo(" 【" + info.ToStr() + "】需要出库 ，拦截托盘 ");
+                            CheckParam = param;
+                        }
+                        return true;
                     }
+
                 }
                 else
                 {

source/DeviceLibrary/model/TrayInfo.cs

@@ -34,7 +34,15 @@ namespace OnlineStore.DeviceLibrary
             }
             else if (InOrOutStore.Equals(2))
             {
-                type = inoutPar.urgentReel ? "紧急出料：" + inoutPar.ToStr() + "" : "出料：" + inoutPar.ToStr() + " ";
+                string outType = "出料：";
+                if (inoutPar.urgentReel)
+                {
+                    outType = "紧急料：";
+                }else if (inoutPar.cutReel)
+                { 
+                    outType = "分盘料：";
+                }
+                type = outType + inoutPar.ToStr();
             }
 
             //return "托盘 [" + TrayCode + "] [" + (IsFull ? "有料" : "空") +"] ["+ type +