分盘料出库bug修改

source/DeviceLibrary/assemblyLine/FeedingEquip.cs

@@ -1111,7 +1111,7 @@ namespace OnlineStore.DeviceLibrary
         }
         }
         public string GetLastTrayInfo()
         public string GetLastTrayInfo()
         {
         {
-            return   "" + LastWidth + "X" + LastHeight + "=" + lastcode + "["+LastPosParam.PosId+"]";
+            return   "" + LastWidth + "X" + LastHeight + "=" + lastcode + "["+((LastPosParam!=null) ?LastPosParam.PosId:"")+"]";
         }
         }
     }
     }
 }
 }

source/DeviceLibrary/assemblyLine/HY/HY_C1_SLStation.cs

@@ -355,8 +355,9 @@ namespace OnlineStore.DeviceLibrary
                     FeedingEquip feed = LineManager.Line.FeedingEquipMap[Config.WorkDeviceId];
                     FeedingEquip feed = LineManager.Line.FeedingEquipMap[Config.WorkDeviceId];
                     if (feed.Config.IsCanOut.Equals(1))
                     if (feed.Config.IsCanOut.Equals(1))
                     {
                     {
+                        TrayInfo trayInfo = TrayManager.GetTrayInfo(currTrayNum );
                         //紧急出料
                         //紧急出料
-                        if (feed.StartTrayOut(MoveInfo.MoveParam))
+                        if (feed.StartTrayOut(trayInfo.InoutPar))
                         {
                         {
                             MoveInfo.NextMoveStep(LineMoveStep.HY08_SL_WaitProcessReel);
                             MoveInfo.NextMoveStep(LineMoveStep.HY08_SL_WaitProcessReel);
                             CheckLog("托盘阻挡" + MoveInfo.SLog + "  " + feed.Name + "始抓料，等待料盘放入或料盘离开 ");
                             CheckLog("托盘阻挡" + MoveInfo.SLog + "  " + feed.Name + "始抓料，等待料盘放入或料盘离开 ");
@@ -589,10 +590,10 @@ namespace OnlineStore.DeviceLibrary
                 if (Config.WorkDeviceId > 0)
                 if (Config.WorkDeviceId > 0)
                 {
                 {
                     TrayInfo trayInfo = TrayManager.GetTrayInfo(trayNum);
                     TrayInfo trayInfo = TrayManager.GetTrayInfo(trayNum);
-                    if (trayInfo.IsFull)
-                    {
-                        return false;
-                    }
+                    //if (trayInfo.IsFull)
+                    //{
+                    //    return false;
+                    //}
 
 
                     //如果是HY02,且T1在等待托盘，先放行一个托盘
                     //如果是HY02,且T1在等待托盘，先放行一个托盘
                     if (DeviceID.Equals(202))
                     if (DeviceID.Equals(202))
@@ -646,7 +647,8 @@ namespace OnlineStore.DeviceLibrary
                 LogUtil.error(Name + "TrayCanLeave ：当前未启动，不需要处理");
                 LogUtil.error(Name + "TrayCanLeave ：当前未启动，不需要处理");
                 return; 
                 return; 
             }
             }
-            if (TrayIsReady())
+            bool isW= MoveInfo.MoveType.Equals(LineMoveType.Fixture) && MoveInfo.IsStep(LineMoveStep.HY07_SL_LocationUp)&&MoveInfo.IsInWait.Equals(false);
+            if (TrayIsReady()|| isW) 
             {
             {
                 if (Config.IsSideWayIn)
                 if (Config.IsSideWayIn)
                 {
                 {