diff --git a/Service/Execute/Step/CarCtrlState.cs b/Service/Execute/Step/CarCtrlState.cs index 3f66d33..d8a7272 100644 --- a/Service/Execute/Step/CarCtrlState.cs +++ b/Service/Execute/Step/CarCtrlState.cs @@ -53,7 +53,7 @@ public class CarCtrlState : IState Task result = TBoxApi.UnLockCarManyTimes(machine.RfidReadModel.VelVin); bool unLock = result.Result; - if (unLock) + if (unLock|| machine.ManualConfirmCarUnlockFlag) { //查询车辆锁止状态 Task carInfo = TBoxApi.GetCarInfo(machine.RfidReadModel.VelVin); diff --git a/Service/Execute/Step/SwapDoneState.cs b/Service/Execute/Step/SwapDoneState.cs index 0fb9a01..b687e1d 100644 --- a/Service/Execute/Step/SwapDoneState.cs +++ b/Service/Execute/Step/SwapDoneState.cs @@ -200,7 +200,7 @@ public class SwapDoneState : IState Task result = TBoxApi.LockCarManyTimes(machine.RfidReadModel.VelVin); bool unLock = result.Result; - if (unLock) + if (unLock|| machine.ManualConfirmCarLockFlag) { //查询车辆锁止状态 @@ -211,7 +211,7 @@ public class SwapDoneState : IState machine,param: $"lock: {unLock} ; heartMsg: {JsonConvert.SerializeObject(carInfo.Result)}",type: machine.ManualConfirmCarLockFlag? (int)SwapConstant.StepType.MANUAL : (int)SwapConstant.StepType.AUTO); - + machine.ManualConfirmCarLockFlag = false; //_CommonMgr.InsertStep(InfoEnum.BusinessSwappingStep.VelLockFlag, // machine); var SoundClient = AppInfo.Container.Resolve();