大盘入库时，待料盘进入料门口等待，再放行料盘。入料三放行托盘修改。

source/AssemblyLineClient/记录.txt

-20200925
+20201127
+大盘入库时，待料盘进入料门口等待，再放行料盘。
+上料三，大盘入库时，等待升降轴上升到位再放行托盘
+
+
+20200925
 1.去掉清理内存代码。
 2.扫码失败保存图片的功能暂时关闭。
 3.halcon的dll更新为18的版本

source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs

@@ -942,7 +942,7 @@ namespace OnlineStore.DeviceLibrary
                     CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Up, IO_Type.SL_MoveCylinder_Down);
                     if (Config.SidesWayNum > 0)
                     {
-                      //  CylinderMove(MoveInfo, IO_Type.SW_LocationCylinder_Down, IO_Type.SW_LocationCylinder_Up);
+                        //  CylinderMove(MoveInfo, IO_Type.SW_LocationCylinder_Down, IO_Type.SW_LocationCylinder_Up);
                     }
                     LastPosParam.TrayNumber = currTrayNum;
                     InLog("料盘移栽" + MoveInfo.SLog + "：上料机构下降，  托盘号【" + currTrayNum + "】，更新托盘信息 ：" + LastPosParam.ToShortStr());
@@ -952,7 +952,7 @@ namespace OnlineStore.DeviceLibrary
                     if (IOValue(IO_Type.SL_AxisLocationCheck).Equals(IO_VALUE.LOW) && MoveInfo.ShelfNoTray.Equals(false))
                     {
                         InLog("获取库位" + MoveInfo.SLog + "： 上料轴开始慢速上升到P3点，不等待结果");
-                        BatchAxisToP3(false,false);
+                        BatchAxisToP3(false, false);
                     }
                 }
                 else if (MoveInfo.IsTimeOut(180))
@@ -970,16 +970,20 @@ namespace OnlineStore.DeviceLibrary
                 ClearTimeoutAlarm("等待空托盘到达超时");
             }
             else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_27_CylinderRelax))
-            { 
+            {
                 MoveInfo.NextMoveStep(LineMoveStep.FI_28_WaitCylinderUp);
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(100));
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_MoveCylinder_Down, IO_VALUE.LOW));
-                CylinderMove(null, IO_Type.SL_MoveCylinder_Down, IO_Type.SL_MoveCylinder_Up); 
+                CylinderMove(null, IO_Type.SL_MoveCylinder_Down, IO_Type.SL_MoveCylinder_Up);
                 TrayPreMove();
             }
             else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_28_WaitCylinderUp))
             {
-                TrayMoveOk();
+                //判断是小盘就直接放行，
+                if (LastWidth.Equals(7) || (Config.SidesWayNum != 2))
+                {
+                    TrayMoveOk();
+                }
                 FI_29_CylinderUp();
             }
             else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_29_CylinderUp))

source/DeviceLibrary/assemblyLine/MoveEquip.cs

@@ -171,17 +171,10 @@ namespace OnlineStore.DeviceLibrary
         {
             trayCheck2LowWait.Stop();
             trayCheckWait.Stop();
-            //如果正在出库中，需要减去托盘号
-            if (MoveInfo.MoveType.Equals(LineMoveType.OutStore))
-            {
-                DebugInfo("停止运动时出库执行中，减去托盘数；");
-                //减去需要的盘数
-            //    TrayManager.DelNeedEmptyTrayNum();
-                MoveInfo.EndMove();
-            }
+            
             runStatus = LineRunStatus.Busy;
             SecondMoveInfo.EndMove();
-
+            MoveInfo.EndMove();
             LogInfo("停止运动：上下气缸上升端，阻挡气缸上升  ");
 
             UpdownUpMove();

source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs

@@ -316,10 +316,13 @@ namespace OnlineStore.DeviceLibrary
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitBoxCanReviceTray());
                 TrayManager.UpdateTrayInfo(num);
                 RemoveInStore(MoveInfo.MoveParam);
-
-                InLog("放托盘（放开阻挡）： " + MoveInfo.SLog + " 物品已移走，顶升气缸1下降");
-                SecondMoveInfo.NextMoveStep(LineMoveStep.MO_14_TopDown);
-                CylinderMove(SecondMoveInfo, IO_Type.TopCylinder_UP, IO_Type.TopCylinder_Down);
+                if (IsBigStore()) { }
+                else
+                {
+                    InLog("放托盘（放开阻挡）： " + MoveInfo.SLog + " 物品已移走，顶升气缸1下降");
+                    SecondMoveInfo.NextMoveStep(LineMoveStep.MO_14_TopDown);
+                    CylinderMove(SecondMoveInfo, IO_Type.TopCylinder_UP, IO_Type.TopCylinder_Down);
+                }
             }
             else if (MoveInfo.MoveStep.Equals(LineMoveStep.MI_10_WaitBox))
             {
@@ -339,10 +342,16 @@ namespace OnlineStore.DeviceLibrary
             else if (MoveInfo.MoveStep.Equals(LineMoveStep.MI_10_CylinderBefore))
             {
                 if (CylinderIsOk(IO_Type.BeforeAfterCylinder_After, IO_Type.BeforeAfterCylinder_Before))
-                {
+                { 
                     MoveInfo.NextMoveStep(LineMoveStep.MI_11_CylinderDown);
                     InLog("入库 " + MoveInfo.SLog + " ，上下气缸下降");
                     UpdownDownP3Move(MoveInfo.MoveParam.PlateH);
+                    if (IsBigStore())
+                    {
+                        InLog("放托盘（放开阻挡）： " + MoveInfo.SLog + " 物品已移走，顶升气缸1下降");
+                        SecondMoveInfo.NextMoveStep(LineMoveStep.MO_14_TopDown);
+                        CylinderMove(SecondMoveInfo, IO_Type.TopCylinder_UP, IO_Type.TopCylinder_Down);
+                    }
                 }
                 else
                 {