放完料自动检测是否完成

source/DeviceLibrary/storeBean/inputBean/BatchMoveBean_Partial.cs

@@ -647,11 +647,11 @@ namespace OnlineStore.DeviceLibrary
                 }
                 }
                 else
                 else
                 {
                 {
-                    //if (SServerManager.GetOutTaskCount(MoveInfo.MoveParam.PosInfo.hSerial) == 0)
-                    //{
-                    //    SendOutShelfLeave("检测到工单已结束:" + MoveInfo.MoveParam.PosInfo.hSerial);
-                    //}
-                    //else
+                    if (SServerManager.GetOutTaskCount(MoveInfo.MoveParam.PosInfo.hSerial) == 0)
+                    {
+                        SendOutShelfLeave("检测到工单已结束:" + MoveInfo.MoveParam.PosInfo.hSerial);
+                    }
+                    else
                     {
                     {
                         doorInfo.status = doorStatusE.outStore;
                         doorInfo.status = doorStatusE.outStore;
                         MoveInfo.NextMoveStep(StepEnum.IS11_ShelfReady);
                         MoveInfo.NextMoveStep(StepEnum.IS11_ShelfReady);

source/DeviceLibrary/storeBean/inputBean/InputEquip_InStore.cs

@@ -1072,6 +1072,7 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             else if (MoveInfo.IsStep(StepEnum.IO31_ClampRelax))
             else if (MoveInfo.IsStep(StepEnum.IO31_ClampRelax))
             {
             {
+                StoreManager.XLRStore.boxEquip.SendStoreState(MoveInfo.MoveParam.PosInfo.PosId, DeviceStatus.OutStoreEnd);
                 if (shelf.Equals(1))
                 if (shelf.Equals(1))
                 {
                 {
 
 
@@ -1083,7 +1084,6 @@ namespace OnlineStore.DeviceLibrary
                     BatchMove_B.ReelPutOk();
                     BatchMove_B.ReelPutOk();
                     SServerManager.ShelfFinish(BatchMove_B.CurrShelf.ShelfRfid, MoveInfo.MoveParam.PosInfo.barcode);
                     SServerManager.ShelfFinish(BatchMove_B.CurrShelf.ShelfRfid, MoveInfo.MoveParam.PosInfo.barcode);
                 }
                 }
-                StoreManager.XLRStore.boxEquip.SendStoreState(MoveInfo.MoveParam.PosInfo.PosId, DeviceStatus.OutStoreEnd);
                 MoveInfo.NextMoveStep(StepEnum.IO32_UpdownToP1);
                 MoveInfo.NextMoveStep(StepEnum.IO32_UpdownToP1);
                 MoveLog($"出库->料串 {MoveInfo.SLog}: 升降轴到P1（待机点）{Config.Updown_P1}");
                 MoveLog($"出库->料串 {MoveInfo.SLog}: 升降轴到P1（待机点）{Config.Updown_P1}");
                 UpdownAxis.AbsMove(MoveInfo, Config.Updown_P1, Config.Updown_P1_Speed);
                 UpdownAxis.AbsMove(MoveInfo, Config.Updown_P1, Config.Updown_P1_Speed);