出库时位置和托盘信息一起更新

source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs

@@ -173,13 +173,13 @@ namespace OnlineStore.DeviceLibrary
             else if (MoveInfo.MoveStep.Equals(LineMoveStep.MO_57_CylinderAfter))
             else if (MoveInfo.MoveStep.Equals(LineMoveStep.MO_57_CylinderAfter))
             {
             {
                 if (CylinderIsOk(IO_Type.BeforeAfterCylinder_Before, IO_Type.BeforeAfterCylinder_After))
                 if (CylinderIsOk(IO_Type.BeforeAfterCylinder_Before, IO_Type.BeforeAfterCylinder_After))
-                { 
+                {
                     if (TrayIsOk())
                     if (TrayIsOk())
                     {
                     {
                         int trayNum = SecondMoveInfo.MoveParam.TrayNumber;
                         int trayNum = SecondMoveInfo.MoveParam.TrayNumber;
                         //去掉直接丢盘处理
                         //去掉直接丢盘处理
                         MoveInfo.NextMoveStep(LineMoveStep.MO_58_CylinderDown);
                         MoveInfo.NextMoveStep(LineMoveStep.MO_58_CylinderDown);
-                        OutLog("出库 " + MoveInfo.SLog + ": 夹具检测编码完成， 上下气缸下降 ,更新料盘位置【" + MoveInfo.MoveParam.WareCode + "】【INLINE】【" + trayNum + "】,顶升气缸上升");
+                        OutLog("出库 " + MoveInfo.SLog + ": 拦截到空托盘【"+trayNum+"】， 上下气缸下降 ,顶升气缸上升");
                         if (MoveInfo.MoveParam != null)
                         if (MoveInfo.MoveParam != null)
                         {
                         {
                             MoveInfo.MoveParam.TrayNumber = trayNum;
                             MoveInfo.MoveParam.TrayNumber = trayNum;
@@ -188,18 +188,21 @@ namespace OnlineStore.DeviceLibrary
                         {
                         {
                             MoveInfo.MoveParam = SecondMoveInfo.MoveParam;
                             MoveInfo.MoveParam = SecondMoveInfo.MoveParam;
                         }
                         }
-
-                        //更新料盘位置
-                        SServerManager.UpdateTrayLoc(Name, MoveInfo.MoveParam.WareCode, LocStatus.INLINE, "E" + trayNum.ToString().PadLeft(2, '0'));
+                      
                         UpdownDownP2Move(MoveInfo.MoveParam.PlateH, MoveInfo.MoveParam.PlateW);
                         UpdownDownP2Move(MoveInfo.MoveParam.PlateH, MoveInfo.MoveParam.PlateW);
                         CylinderMove(MoveInfo, IO_Type.TopCylinder_Down, IO_Type.TopCylinder_UP);
                         CylinderMove(MoveInfo, IO_Type.TopCylinder_Down, IO_Type.TopCylinder_UP);
-                    } 
+                    }
                 }
                 }
             }
             }
             else if (MoveInfo.MoveStep.Equals(LineMoveStep.MO_58_CylinderDown))
             else if (MoveInfo.MoveStep.Equals(LineMoveStep.MO_58_CylinderDown))
             {
             {
-                OutLog("出库 " + MoveInfo.SLog + ":    夹料气缸放松，更新托盘【" + MoveInfo.MoveParam.TrayNumber + "】，有料盘，OutStore，【" + MoveInfo.MoveParam.ToStr() + "】");
+                OutLog("出库 " + MoveInfo.SLog + ":    夹料气缸放松 ");
+                int trayNum = MoveInfo.MoveParam.TrayNumber; 
+                //更新料盘位置
+                SServerManager.UpdateTrayLoc(Name, MoveInfo.MoveParam.WareCode, LocStatus.INLINE, "E" + trayNum.ToString().PadLeft(2, '0'));
                 TrayManager.UpdateTrayInfo(MoveInfo.MoveParam.TrayNumber, true, ReelType.OutStore, MoveInfo.MoveParam);
                 TrayManager.UpdateTrayInfo(MoveInfo.MoveParam.TrayNumber, true, ReelType.OutStore, MoveInfo.MoveParam);
+                TrayInfo tray = TrayManager.GetTrayInfo(trayNum);
+                LogInfo("出库 " + MoveInfo.SLog + ":    夹料气缸放松，更新料盘位置【" + MoveInfo.MoveParam.WareCode + "】【INLINE】更新托盘【" + trayNum + "】 " + tray.ToStr() + "");
 
 
                 //出库全部完成 
                 //出库全部完成 
                 lineStatus = LineStatus.StoreOnline;
                 lineStatus = LineStatus.StoreOnline;