料号不一致时托盘直接放走不等待

source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs

@@ -50,11 +50,14 @@ namespace OnlineStore.DeviceLibrary
         }
         public override void CheckAlarmProcess(LineMoveInfo moveInfo, LineAlarmType alarmType)
         {
-            if (moveInfo.MoveType.Equals(LineMoveStep.FI_18_WaitNoLocationCheck) && alarmType.Equals(LineAlarmType.IoSingleTimeOut))
+            if (moveInfo.MoveStep.Equals(LineMoveStep.FI_18_WaitNoLocationCheck) && alarmType.Equals(LineAlarmType.IoSingleTimeOut))
             {
                 string code = CodeManager.ProcessCode(LastCodeList);
-                LogUtil.error(moveInfo.Name + " [" + moveInfo.MoveType + "][" + moveInfo.MoveStep + "]等待SL_AxisLocationCheck=LOW超时，清空当前料盘条码：" + code);
-                LastCodeList = new List<string>();
+                if (!String.IsNullOrEmpty(code))
+                {
+                    LogUtil.error(moveInfo.Name + " [" + moveInfo.MoveType + "][" + moveInfo.MoveStep + "]等待 SL_AxisLocationCheck=LOW 超时，清空缓存条码：" + code);
+                    LastCodeList = new List<string>();
+                }
             }
         }
         public event TrayProcessEnd TrayPEndEvent;
@@ -1428,7 +1431,17 @@ namespace OnlineStore.DeviceLibrary
                             LogUtil.error(Name + " 【" + info.ToStr() + "】需要出库，正在送出料架，暂不处理", DeviceID * 1000 + 18);
                             return false;
                         }
-
+                        string lastXuniRfid = LastOutParam.rfid;
+                        if (String.IsNullOrEmpty(lastXuniRfid).Equals(false) && (!lastXuniRfid.Equals(param.rfid)))
+                        {
+                            //如果流水线还有次料架的任务，暂不送出
+                            int count = TrayManager.GetOutTaskByRfid(lastXuniRfid);
+                            if (count > 0)
+                            {
+                                LogUtil.error(Name + " 【" + info.ToStr() + "】需要出库，料架号不一致[" + lastXuniRfid + "][" + param.rfid + "]，当前料架还有【" + count + "】个任务，托盘先离开", DeviceID * 1000 + 19);
+                                return false;
+                            }
+                        }
                         if (NeedSaveParam)
                         {
                             LogInfo(" 【" + info.ToStr() + "】需要出库 ，拦截托盘 ");