移栽等待托盘bug修改

source/DeviceLibrary/assemblyLine/FeedingEquip.cs

@@ -1164,7 +1164,8 @@ namespace OnlineStore.DeviceLibrary
         }
         public string GetLastTrayInfo()
         {
-            return   "" + LastWidth + "X" + LastHeight + "=" + lastcode +( (LastPosParam!=null) ?("[" + LastPosParam.PosId + "]"): "")+(LastPosParam.IsNG?("入库NG:"+LastPosParam.NgMsg):"");
+            
+            return   "" + LastWidth + "X" + LastHeight + "=" + lastcode +( (LastPosParam!=null) ?("[" + LastPosParam.PosId + "]"): "")+((bool)(LastPosParam?.IsNG)?("入库NG:"+LastPosParam?.NgMsg):"");
         }
     }
-}
+} 

source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs

@@ -383,8 +383,18 @@ namespace OnlineStore.DeviceLibrary
             }
             else if (MoveInfo.IsStep(LineMoveStep.MO_57_WaitHasReel))
             {
-                MoveInfo.NextMoveStep(LineMoveStep.MO_58_WaitTray);
-                OutLog("出库 " + MoveInfo.SLog + ":  等待托盘到达");
+                if (IsBigStore())
+                {
+                    MoveInfo.NextMoveStep(LineMoveStep.MO_58_WaitTray);
+                    OutLog("出库 " + MoveInfo.SLog + ":  等待托盘到达");
+                }
+                else
+                {
+                    MoveInfo.NextMoveStep(LineMoveStep.MO_59_CylinderAfter);
+                    MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(200));
+                    OutLog("出库 " + MoveInfo.SLog + ":  前后气缸后退");
+                    CylinderMove(MoveInfo, IO_Type.BeforeAfterCylinder_Before, IO_Type.BeforeAfterCylinder_After);
+                }
             }
             else if (MoveInfo.IsStep(LineMoveStep.MO_58_WaitTray))
             {