From 9c72aa6562621932d7d13c0574e713daff1b19f1 Mon Sep 17 00:00:00 2001 From: zby <2494737567@qq.com> Date: Tue, 15 Oct 2024 08:57:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A1=AE=E8=AE=A4=E5=8A=A0?= =?UTF-8?q?=E8=A7=A3=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Service/Execute/Step/CarCtrlState.cs | 2 +- Service/Execute/Step/SwapDoneState.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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();