存储机构-屏蔽信号应用到出入库

source/DeviceLibrary/storeBean/boxBean/BoxEquip_InExecute.cs

@@ -22,7 +22,7 @@ namespace OnlineStore.DeviceLibrary
         /// <returns></returns>
         private bool CheckInStoreOtherSideInfo()
         {
-            if(MoveInfo.MoveParam.PosInfoBack !=null)
+            if (MoveInfo.MoveParam.PosInfoBack != null)
             {
                 return true;
             }
@@ -54,7 +54,7 @@ namespace OnlineStore.DeviceLibrary
 
             if (!AutoInout.autoNext && !InDoorCheck(param))
             {
-                if (param==null || param.PosInfo == null)
+                if (param == null || param.PosInfo == null)
                     return false;
                 SetWarnMsg(Name + $" 启动入库出错，入口料盘无入库信息[barcode={param.PosInfo.barcode},PosSide={param.PosInfo.GetPosSide()}], 任务取消");
                 SServerManager.cancelPutInTask(Name, param.PosInfo.barcode);
@@ -87,13 +87,13 @@ namespace OnlineStore.DeviceLibrary
         /// </summary>
         private void ClearInDoorBuffer()
         {
-            if(MoveInfo.MoveParam.PosInfo.GetPosSide().Equals("A"))
+            if (MoveInfo.MoveParam.PosInfo.GetPosSide().Equals("A"))
             {
                 BufferDataManager.AInStoreInfo = null;
                 LogInfo($"入库 {MoveInfo.SLog}：取料完成，清除该暂存区的料盘信息[barcode={MoveInfo.MoveParam.PosInfo.barcode}][{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
 
             }
-            else if(MoveInfo.MoveParam.PosInfo.GetPosSide().Equals("B"))
+            else if (MoveInfo.MoveParam.PosInfo.GetPosSide().Equals("B"))
             {
                 BufferDataManager.BInStoreInfo = null;
                 LogInfo($"入库 {MoveInfo.SLog}：取料完成，清除该暂存区的料盘信息[barcode={MoveInfo.MoveParam.PosInfo.barcode}][{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
@@ -108,10 +108,10 @@ namespace OnlineStore.DeviceLibrary
         {
             inOutPosInfo = null;
             if (CheckASide())
-            {                
+            {
                 if (InDoorCheck(new InOutParam(BufferDataManager.AInStoreInfo)))
                 {
-                    inOutPosInfo= BufferDataManager.AInStoreInfo.ToCopy();
+                    inOutPosInfo = BufferDataManager.AInStoreInfo.ToCopy();
                     return true;
                 }
 
@@ -135,7 +135,7 @@ namespace OnlineStore.DeviceLibrary
                     PullAxisToP1("入库");
                     break;
                 case StepEnum.SI_01_PullAxis_Ready:
-                    SetBoxStatus(DeviceStatus.InStoreExecute, RunStatus.Busy,MoveInfo.MoveParam.PosInfo.PosId);
+                    SetBoxStatus(DeviceStatus.InStoreExecute, RunStatus.Busy, MoveInfo.MoveParam.PosInfo.PosId);
                     MoveInfo.NextMoveStep(StepEnum.SI_01_Pull_Updown_ToPosition);
                     if (!IsMoveAxisInSafePos())
                     {
@@ -188,13 +188,13 @@ namespace OnlineStore.DeviceLibrary
 
                     break;
                 case StepEnum.SI_03_VerifyBufferState:
-                    if(!CheckInputMiddleAxisInBuff())
+                    if (!CheckInputMiddleAxisInBuff())
                     {
                         MoveInfo.NextMoveStep(StepEnum.SI_04_InOutToBuff);
                         LogInfo($"入库 {MoveInfo.SLog}：移栽X轴到暂存区取放点P2[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
                         XAxis_To_P2();
                     }
-                    else if(MoveInfo.IsTimeOut())
+                    else if (MoveInfo.IsTimeOut())
                     {
                         SetWarnMsg($"等待上料机构旋转轴离开{MoveInfo.MoveParam.PosInfo.GetPosSide()}面暂存区超时");
                     }
@@ -252,7 +252,7 @@ namespace OnlineStore.DeviceLibrary
                     MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000));
                     break;
                 case StepEnum.SI_08_ToPosition:
-                    if(CamCheckReelPosition())
+                    if (CamCheckReelPosition())
                     {
                         MoveInfo.NextMoveStep(StepEnum.SI_09_ToTray);
                         LogInfo($"入库 {MoveInfo.SLog}：到抽屉提取点，料斗拉取进出轴到料屉提取点P2/P4[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
@@ -291,7 +291,7 @@ namespace OnlineStore.DeviceLibrary
                     MoveInfo.NextMoveStep(StepEnum.SI_15_UpDownBack);
                     LogInfo($"入库 {MoveInfo.SLog}：叉子从库位返回，[{MoveInfo.MoveParam.PosInfo.ToStr()}]入库完成，移栽升降轴到料屉上方过度点P6/P12[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
                     //入库完成
-                    SetBoxStatus(DeviceStatus.InStoreEnd, RunStatus.Busy,MoveInfo.MoveParam.PosInfo.PosId);
+                    SetBoxStatus(DeviceStatus.InStoreEnd, RunStatus.Busy, MoveInfo.MoveParam.PosInfo.PosId);
                     UpdownAxisTo_P6_P12();
                     break;
                 case StepEnum.SI_15_UpDownBack:
@@ -310,12 +310,14 @@ namespace OnlineStore.DeviceLibrary
                     if (CheckASide())
                     {
                         LogInfo($"入库 {MoveInfo.SLog}：料斗拉取升降轴到料屉水平点P2,同时检测{trayAColumns[GetPosColumn()]}=1[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
-                        MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(trayAColumns[GetPosColumn()], IO_VALUE.HIGH));
+                        if (!GetShieldState(sheidAColmns[GetPosColumn()]))
+                            MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(trayAColumns[GetPosColumn()], IO_VALUE.HIGH));
                     }
                     else
                     {
                         LogInfo($"入库 {MoveInfo.SLog}：料斗拉取升降轴到料屉水平点P2,同时检测{trayBColumns[GetPosColumn()]} = 1[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
-                        MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(trayBColumns[GetPosColumn()], IO_VALUE.HIGH));
+                        if (!GetShieldState(sheidBColmns[GetPosColumn()]))
+                            MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(trayBColumns[GetPosColumn()], IO_VALUE.HIGH));
                     }
                     break;
                 case StepEnum.SI_18_PutTrayMiddle:

source/DeviceLibrary/storeBean/boxBean/BoxEquip_OutExecute.cs

@@ -120,12 +120,14 @@ namespace OnlineStore.DeviceLibrary
                     if (CheckASide())
                     {
                         LogInfo($"出库 {MoveInfo.SLog}：料斗拉取升降轴到料屉水平点P2,同时检测{trayAColumns[GetPosColumn()]}=1[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
-                        MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(trayAColumns[GetPosColumn()], IO_VALUE.HIGH));
+                        if (!GetShieldState(sheidAColmns[GetPosColumn()]))
+                            MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(trayAColumns[GetPosColumn()], IO_VALUE.HIGH));
                     }
                     else
                     {
                         LogInfo($"出库 {MoveInfo.SLog}：料斗拉取升降轴到料屉水平点P2,同时检测{trayBColumns[GetPosColumn()]} = 1[{MoveInfo.MoveParam.PosInfo.GetPosSide()}面]");
-                        MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(trayBColumns[GetPosColumn()], IO_VALUE.HIGH));
+                        if (!GetShieldState(sheidBColmns[GetPosColumn()]))
+                            MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(trayBColumns[GetPosColumn()], IO_VALUE.HIGH));
                     }
                     break;
                 case StepEnum.SO_12_PutTrayMiddle: