横移机构可以同时存在两个托盘

source/AssemblyLineClient/记录.txt

@@ -162,7 +162,7 @@ AIO的dll更新，增加重连功能。
 上料模块，只有料盘到达流水线上方后才拦截托盘。
 上料模块，只有料盘到达流水线上方后才拦截托盘。
 
 
 
 
-
+20200228修改，横移机构可以同时存在两个托盘
 
 
 
 
 
 

source/DeviceLibrary/assemblyLine/LineBean.cs

@@ -317,7 +317,8 @@ namespace OnlineStore.DeviceLibrary
 
 
             //横移轨道下降
             //横移轨道下降
             SideWayStop();
             SideWayStop();
-
+            SW23WaitTrayNum = -1;
+            SW41WaitTrayNum = -1;
             CheckAndMove(IO_Type.SW2_StopDown, IO_VALUE.LOW);
             CheckAndMove(IO_Type.SW2_StopDown, IO_VALUE.LOW);
             CheckAndMove(IO_Type.SW4_StopDown, IO_VALUE.LOW);
             CheckAndMove(IO_Type.SW4_StopDown, IO_VALUE.LOW);
 
 

source/DeviceLibrary/model/LineMoveInfo.cs

@@ -290,6 +290,13 @@ namespace OnlineStore.DeviceLibrary
             wait.WaitType = WaitEnum.W009_BoxCanInstore;
             wait.WaitType = WaitEnum.W009_BoxCanInstore;
             return wait;
             return wait;
         }
         }
+        public static WaitResultInfo WaitSWCanTopUp(int swNum)
+        {
+            WaitResultInfo wait = new WaitResultInfo();
+            wait.WaitType = WaitEnum.W010_SWCanTopUp;
+            wait.TargetPosition = swNum;
+            return wait;
+        }
         //public static WaitResultInfo WaitSideWay()
         //public static WaitResultInfo WaitSideWay()
         //{
         //{
         //    WaitResultInfo wait = new WaitResultInfo();
         //    WaitResultInfo wait = new WaitResultInfo();
@@ -386,9 +393,9 @@ namespace OnlineStore.DeviceLibrary
             else if (WaitType.Equals(WaitEnum.W009_BoxCanInstore))
             else if (WaitType.Equals(WaitEnum.W009_BoxCanInstore))
             {
             {
                 return "BOX可以开始入库";
                 return "BOX可以开始入库";
-            }else if (WaitType.Equals(WaitEnum.W010_SW34NoTray))
+            }else if (WaitType.Equals(WaitEnum.W010_SWCanTopUp))
             {
             {
-                return "等待横移34无托盘";
+                return "等待横移"+TargetPosition+"无托盘";
             }
             }
             else if (WaitType.Equals(WaitEnum.W101_BatchAxisMove))
             else if (WaitType.Equals(WaitEnum.W101_BatchAxisMove))
             {
             {
@@ -509,9 +516,9 @@ namespace OnlineStore.DeviceLibrary
         /// </summary>
         /// </summary>
         internal static int W009_BoxCanInstore = 9;
         internal static int W009_BoxCanInstore = 9;
         /// <summary>
         /// <summary>
-        /// 等待横移34无托盘
+        /// 等待横移模块可以顶升，等待入料四和入料一处无托盘处理
         /// </summary>
         /// </summary>
-        internal static int W010_SW34NoTray = 10;
+        internal static int W010_SWCanTopUp = 10;
         /// <summary>
         /// <summary>
         /// 入料模块：批量轴缓慢上升，并检测有料盘后停止
         /// 入料模块：批量轴缓慢上升，并检测有料盘后停止
         /// </summary>
         /// </summary>

source/DeviceLibrary/model/StoreStep.cs

@@ -420,40 +420,39 @@ namespace OnlineStore.DeviceLibrary
         /// </summary>
         /// </summary>
         SW03_WaitTime = 5003,
         SW03_WaitTime = 5003,
         /// <summary>
         /// <summary>
-        /// 等待轨道1夹具检测信号
+        /// 等待轨道1夹具检测信号，等待横移3或横移1无托盘
         /// </summary>
         /// </summary>
-        SW04_WaitCheck = 5004,
-
+        SW04_WaitCanUp= 5004,
+        /// <summary>
+        /// 定位气缸下降
+        /// </summary>
+        SW05_LocationDown=5005,
         /// <summary>
         /// <summary>
         /// 横移轨道顶升气缸上升
         /// 横移轨道顶升气缸上升
         /// </summary>
         /// </summary>
-        SW05_TopCylinderUp= 5005,
+        SW06_TopCylinderUp= 5006,
         /// <summary>
         /// <summary>
         /// 等待第二个横移没有托盘
         /// 等待第二个横移没有托盘
         /// </summary>
         /// </summary>
-        SW06_WaitNoTray=5006,
+        SW07_WaitNoTray=5007,
         /// <summary>
         /// <summary>
         /// 横移轨道点击转动
         /// 横移轨道点击转动
         /// </summary>
         /// </summary>
-        SW07_DriveMotorMove=5007,
+        SW08_DriveMotorMove=5008,
 
 
         /// <summary>
         /// <summary>
         /// 收到横移轨道2夹具检测信号
         /// 收到横移轨道2夹具检测信号
         /// </summary>
         /// </summary>
-        SW08_WaitOutCheck=5008,
+        SW09_WaitOutCheck=5009,
         /// <summary>
         /// <summary>
         /// 等待出口信号持续一段时间
         /// 等待出口信号持续一段时间
         /// </summary>
         /// </summary>
-        SW09_WatOutFixture2=5009,
+        SW10_WatOutFixture2=5010,
         /// <summary>
         /// <summary>
         /// 停止横移轨道转动，横移轨道顶升气缸下降
         /// 停止横移轨道转动，横移轨道顶升气缸下降
         /// </summary>
         /// </summary>
-        SW10_TopDown=5010,
+        SW11_TopDown=5011,
          
          
-        ///// <summary>
-        ///// 阻挡2下降，等待托盘流出
-        ///// </summary>
-        //SW11_StopDrive=5011,
         /// <summary>
         /// <summary>
         /// 等待托盘流出，上升阻挡气缸
         /// 等待托盘流出，上升阻挡气缸
         /// </summary>
         /// </summary>