冲突解决

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs

@@ -17,7 +17,8 @@ namespace OnlineStore.DeviceLibrary
         /// </summary>
         public List<string> PositionNumList = new List<string>();
         /// <summary>
-        /// 入库完成后自动出库，出库完成后自动入库
+        /// 入库完成后自动出库，出库完成后自动入库 或者
+        /// 上一个盘点完，自动盘点下一个
         /// </summary>
         public bool autoNext = false;
         /// <summary>
@@ -67,10 +68,12 @@ namespace OnlineStore.DeviceLibrary
                 p.ComPress_P3 = position.CompressAxis_CPosition_P3;
                 p.InOut_P3 = position.InOutAxis_Position_P3;
                 p.Middle_P2 = position.MiddleAxis_Position_P2;
+                p.Middle_P3 = position.MiddleAxis_Position_P3;
                 p.UpDown_P3 = position.UpDownAxis_IHPosition_P3;
                 p.UpDown_P4 = position.UpDownAxis_ILPosition_P4;
                 p.UpDown_P5 = position.UpDownAxis_OLPosition_P5;
                 p.UpDown_P6 = position.UpDownAxis_OHPosition_P6;
+                p.UpDown_P9 = position.UpDownAxis_Position_P9;
                 param.MoveP = p;
 
                 if (param.PosInfo.PlateH <= 0)
@@ -177,10 +180,20 @@ namespace OnlineStore.DeviceLibrary
                     {
                         timeOutMs = 5000;
                     }
+                    if (StoreMove.MoveStep.Equals(StoreMoveStep.SC_03_MoveToHBag))
+                    {
+                        timeOutMs = 20000;
+                    }
                     if ((!wait.IsEnd) && span.TotalMilliseconds > timeOutMs)
                     {
                         ConfigIO io = Config.getWaitIO(wait.IoType);
                         WarnMsg = StoreName + "[" + StoreMove.MoveType + "][" + StoreMove.MoveStep + "] 等待" + io.DisplayStr + "=" + wait.IoValue + "超时 ";
+                        if (WarnMsg.Contains("CheckPos") || WarnMsg.Contains("X03_点检"))
+                        {
+                            WarnMsg = "";
+                            break;
+                        }
+
                         Alarm(StoreAlarmType.IoSingleTimeOut, io.ElectricalDefinition, WarnMsg, StoreMove.MoveType);
                         LogUtil.error(LOGGER, StoreName + wait.IoType + "等待信号(" + io.DisplayStr + "=" + wait.IoValue + ") 超时", 14);
                         isOk = false;
@@ -252,7 +265,13 @@ namespace OnlineStore.DeviceLibrary
             {
                 WarnMsg = StoreName + "[" + StoreMove.MoveType + "][" + StoreMove.MoveStep + "] 等待超时  [" + NotOkMsg
                     + "]已等待[" + Math.Round(span.TotalSeconds, 1) + "]秒";
-                LogUtil.error(LOGGER, WarnMsg, 100);
+                if (WarnMsg.Contains("CheckPos") || WarnMsg.Contains("X03_点检"))
+                {
+                    WarnMsg = "";
+                    return;
+                }
+                
+                LogUtil.error(LOGGER, WarnMsg,100); 
                 Alarm(StoreAlarmType.IoSingleTimeOut, "", WarnMsg, StoreMove.MoveType);
             }
         }