bug修改

source/DeviceLibrary/bean/EquipBean_Partial.cs

@@ -443,12 +443,12 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 return;
                 return;
             }
             }
-         
-           
+
+
             if (MoveInfo.IsStep(MoveStep.SO_11_InOutToP1))
             if (MoveInfo.IsStep(MoveStep.SO_11_InOutToP1))
             {
             {
                 SO_12_AxisToP1();
                 SO_12_AxisToP1();
-             
+
 
 
             }
             }
             else if (MoveInfo.IsStep(MoveStep.SO_12_AxisToP1))
             else if (MoveInfo.IsStep(MoveStep.SO_12_AxisToP1))
@@ -494,7 +494,7 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             else if (MoveInfo.IsStep(MoveStep.SO_17_TrayCheck))
             else if (MoveInfo.IsStep(MoveStep.SO_17_TrayCheck))
             {
             {
-                MoveToPosition(moveP); 
+                MoveToPosition(moveP);
             }
             }
             #region ->料架
             #region ->料架
             else if (MoveInfo.IsStep(MoveStep.SO_21_MoveToBag))
             else if (MoveInfo.IsStep(MoveStep.SO_21_MoveToBag))
@@ -517,7 +517,7 @@ namespace OnlineStore.DeviceLibrary
             else if (MoveInfo.IsStep(MoveStep.SO_23_PutReel))
             else if (MoveInfo.IsStep(MoveStep.SO_23_PutReel))
             {
             {
                 MoveInfo.NextMoveStep(MoveStep.SO_24_InoutBack);
                 MoveInfo.NextMoveStep(MoveStep.SO_24_InoutBack);
-                MoveLog(" 进出轴动作至P1[" + moveP.InOut_P1 + "],调用SheflFinish "); 
+                MoveLog(" 进出轴动作至P1[" + moveP.InOut_P1 + "],调用SheflFinish ");
                 ACAxisMove(Config.InOut_Axis, moveP.InOut_P1, Config.InOutAxis_P1_Speed);
                 ACAxisMove(Config.InOut_Axis, moveP.InOut_P1, Config.InOutAxis_P1_Speed);
                 HttpServer.ShelfFinish(CurrTray.realRFID, CurrTray.barcode, CurrTray.shelfP.ToString());
                 HttpServer.ShelfFinish(CurrTray.realRFID, CurrTray.barcode, CurrTray.shelfP.ToString());
             }
             }
@@ -525,7 +525,7 @@ namespace OnlineStore.DeviceLibrary
             {
             {
                 MoveInfo.NextMoveStep(MoveStep.SO_25_GoBack);
                 MoveInfo.NextMoveStep(MoveStep.SO_25_GoBack);
                 MoveLog("  返回待机点，轴2/轴1动作至P1,轴4到压紧前点，判断料架是否需要离开");
                 MoveLog("  返回待机点，轴2/轴1动作至P1,轴4到压紧前点，判断料架是否需要离开");
-                foreach(WorkStation obj in StationMap.Values)
+                foreach (WorkStation obj in StationMap.Values)
                 {
                 {
                     if (obj.CurrShelf.IsBusy)
                     if (obj.CurrShelf.IsBusy)
                     {
                     {
@@ -576,8 +576,16 @@ namespace OnlineStore.DeviceLibrary
             else if (MoveInfo.IsStep(MoveStep.SO_33_PutReel))
             else if (MoveInfo.IsStep(MoveStep.SO_33_PutReel))
             {
             {
                 MoveInfo.NextMoveStep(MoveStep.SO_34_InoutToP1);
                 MoveInfo.NextMoveStep(MoveStep.SO_34_InoutToP1);
-                MoveLog(" 进出轴动作至P1[" + moveP.InOut_P1 + "] "); 
                 ACAxisMove(Config.InOut_Axis, moveP.InOut_P1, Config.InOutAxis_P1_Speed);
                 ACAxisMove(Config.InOut_Axis, moveP.InOut_P1, Config.InOutAxis_P1_Speed);
+                if (MoveInfo.MoveParam.PosInfo.urgentReel)
+                {
+                    MoveLog(" 进出轴动作至P1[" + moveP.InOut_P1 + "],调用SheflFinish ");
+                    HttpServer.ShelfFinish("F000", MoveInfo?.MoveParam?.PosInfo?.barcode, "0");
+                }
+                else
+                {
+                    MoveLog(" 进出轴动作至P1[" + moveP.InOut_P1 + "] ");
+                }
             }
             }
             else if (MoveInfo.IsStep(MoveStep.SO_34_InoutToP1))
             else if (MoveInfo.IsStep(MoveStep.SO_34_InoutToP1))
             {
             {