Merge branch 'master' of http://106.15.194.121:8083/lina/SO908-XLRStore

source/DeviceLibrary/storeBean/inputBean/InputEquip.cs

@@ -371,19 +371,7 @@ namespace OnlineStore.DeviceLibrary
             IOTimeOutProcess();
             //判断流水线打开了才可以运行  
             List<BatchMoveBean> BatchMoveList = new List<BatchMoveBean>() { BatchMove_A, BatchMove_B };
-            if (MoveInfo.MoveType.Equals(MoveType.None) && NoErrorAlarm())
-            {
-                //若左侧或右侧在等待扫码结束的状态，需要开始去取料 
-                foreach (BatchMoveBean moveBean in BatchMoveList)
-                {
-                    if (moveBean.MoveInfo.MoveType.Equals(MoveType.InStore) && moveBean.MoveInfo.IsStep(StepEnum.IB10_ScanOK))
-                    {
-                        LogInfo(moveBean.Name + "开始取料:" + moveBean.GetInstoreParam().PosInfo.ToStr());
-                        StartInstore(moveBean.GetInstoreParam());
-                        break;
-                    }
-                }
-            }
+         
             if (MoveInfo.MoveType.Equals(MoveType.None) && NoErrorAlarm())
             {
                 if (CheckStartOutPos("A下暂存区", BufferDataManager.AOutStoreInfo, IO_Type.UnderArea_Check_A, BatchMoveList))
@@ -409,6 +397,19 @@ namespace OnlineStore.DeviceLibrary
 
             }
 
+            if (MoveInfo.MoveType.Equals(MoveType.None) && NoErrorAlarm())
+            {
+                //若左侧或右侧在等待扫码结束的状态，需要开始去取料 
+                foreach (BatchMoveBean moveBean in BatchMoveList)
+                {
+                    if (moveBean.MoveInfo.MoveType.Equals(MoveType.InStore) && moveBean.MoveInfo.IsStep(StepEnum.IB10_ScanOK))
+                    {
+                        LogInfo(moveBean.Name + "开始取料:" + moveBean.GetInstoreParam().PosInfo.ToStr());
+                        StartInstore(moveBean.GetInstoreParam());
+                        break;
+                    }
+                }
+            }
 
             foreach (BatchMoveBean moveBean in BatchMoveList)
             {