1、增加Input料仓取料失败自动跳过功能。

2、增加Input料盘取料完成搬运到Empty前报警检查是否有产品。

Rs.DeweyTester/Commom/GlobalVar.cs

@@ -22,6 +22,18 @@ namespace Rs.Framework
     {
         #region newpro
 
+        /// <summary>
+        /// 料仓取料失败是否跳过
+        /// </summary>
+        [ParameterInit("bool", "true", "system", "料仓取料失败是否跳过")]
+        public static bool BinTakeFailSkip
+        {
+            get
+            {
+                return SysConfigParam.GetValue<bool>(nameof(BinTakeFailSkip));
+            }
+        }
+
 
         /// <summary>
         /// XY到位后延时

Rs.DeweyTester/Flow/AlarmConstID.cs

@@ -244,5 +244,11 @@ namespace Rs.MotionPlat.Flow
         /// 二维码长度异常报警
         /// </summary>
         public const int 二维码长度异常报警 = 1049;
+
+        /// <summary>
+        /// Input料盘开始搬运到Empty前报警
+        /// </summary>
+        public const int Input料盘开始搬运到Empty前报警 = 1050;
+
     }
 }

Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs

@@ -352,6 +352,11 @@ namespace Rs.MotionPlat.Flow
                                     {
                                         //先把轴移动到安全位
                                         DischargeModuleGoSafePosFlow.Instance.GoSafePostion();
+                                        alarmEntity = AlarmCollection.Get(AlarmConstID.Input料盘开始搬运到Empty前报警);
+                                        if(alarmEntity!=null)
+                                        {
+                                            Msgbox.ShowDialog(alarmEntity, EButtonType.Ok, true);
+                                        }
                                         TakeTrayFlow.Instance.Take(ETrayType.Input, ETrayType.Empty);
                                         //GlobalTray.InputTray.ChangeStatus(ESlotStatus.Have);
                                         takeSlotIndex = 1;

Rs.DeweyTester/Flow/SubFlow/StockTakeFlow.cs

@@ -252,8 +252,19 @@ namespace Rs.MotionPlat.Flow.SubFlow
                         }
                         else
                         {
-                            AlarmEntity alarmEntity = AlarmCollection.Get(AlarmConstID.排料吸嘴取料失败报警).Transform($"{curNozzle.NozzleIndex}",$"{waitTakeProductSlot.Row}",$"{waitTakeProductSlot.Column}",$"{waitTakeProductSlot.Index}");
-                            EButtonType btnSelect = Msgbox.ShowDialog(alarmEntity,EButtonType.EndInput | EButtonType.Retry | EButtonType.Skip | EButtonType.Recheck,true);
+                            if(GlobalVar.BinTakeFailSkip && trayType== ETrayType.Input)
+                            {
+                                logInfo = GetClassName() + $"{trayType} bin {waitTakeProductSlot.Index} take fail auto skip";
+                                MessageQueue.Instance.Insert(logInfo);
+                                curNozzle.VacBreak(EIoOperate.Close, GetClassName());
+                                curNozzle.VacSuction(EIoOperate.Close, GetClassName());
+                                finished = true;
+                                flowStep = EStockTakeFlowStep.待触发;
+                            }
+                            else
+                            {
+                                AlarmEntity alarmEntity = AlarmCollection.Get(AlarmConstID.排料吸嘴取料失败报警).Transform($"{curNozzle.NozzleIndex}", $"{waitTakeProductSlot.Row}", $"{waitTakeProductSlot.Column}", $"{waitTakeProductSlot.Index}");
+                                EButtonType btnSelect = Msgbox.ShowDialog(alarmEntity, EButtonType.EndInput | EButtonType.Retry | EButtonType.Skip | EButtonType.Recheck, true);
                                 switch (btnSelect)
                                 {
                                     case EButtonType.EndInput:
@@ -290,6 +301,8 @@ namespace Rs.MotionPlat.Flow.SubFlow
                                         break;
                                 }
                             }
+                            
+                        }
                         break;
                 }
             }

Rs.DeweyTester/Properties/AssemblyInfo.cs

@@ -31,6 +31,6 @@ using System.Runtime.InteropServices;
 //
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
- [assembly: AssemblyVersion("20.25.34.2")]
+ [assembly: AssemblyVersion("20.25.35.1")]
 //[assembly: AssemblyVersion("1.0.0.0")]
 //[assembly: AssemblyFileVersion("1.0.0.0")]