From 1f745b55a78b58f5d4baf03d830ca8179c479f6f Mon Sep 17 00:00:00 2001 From: lxw Date: Wed, 12 Jun 2024 11:03:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E6=8A=A5=E4=BA=91?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=95=B0=E6=8D=AE=20=E6=96=B0=E8=B5=B7?= =?UTF-8?q?=E7=BA=BF=E7=A8=8B=E5=A4=84=E7=90=86=EF=BC=8C=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E4=BB=8E=E7=AB=99=E6=8E=A7=E8=A7=92=E5=BA=A6=E5=A4=84=E7=90=86?= =?UTF-8?q?=E4=BA=91=E5=B9=B3=E5=8F=B0=E8=83=BD=E7=AB=8B=E9=A9=AC=E6=94=B6?= =?UTF-8?q?=E5=88=B0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Service/Execute/Step/SwapDoneState.cs | 21 ++++++++++++--------- Service/MyTask/SwapOrderReportCloudTask.cs | 2 +- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Service/Execute/Step/SwapDoneState.cs b/Service/Execute/Step/SwapDoneState.cs index b5afa14..20ab48c 100644 --- a/Service/Execute/Step/SwapDoneState.cs +++ b/Service/Execute/Step/SwapDoneState.cs @@ -43,13 +43,16 @@ public class SwapDoneState : IState _CommonMgr.UpdateAmtOrder(machine); } - //新增换电成功上报云平台数据 - _CommonMgr.InsertCloudReportForSwapSuccess(machine); - //换电成功关于bininfo表的更新 - _CommonMgr.UpdateBinInfoForSwapSuccess(machine); - - //可人工确认换电成功标识 - machine.PlcSwapFlag = true; + Task.Run(() => + { + //新增换电成功上报云平台数据 + _CommonMgr.InsertCloudReportForSwapSuccess(machine); + //换电成功关于bininfo表的更新 + _CommonMgr.UpdateBinInfoForSwapSuccess(machine); + + //可人工确认换电成功标识 + machine.PlcSwapFlag = true; + }); if (machine.SwapStatus == (int)InfoEnum.SwapOrderResult.Success) { @@ -87,7 +90,7 @@ public class SwapDoneState : IState /// public InvokeStatus LockCar(SwappingStateMachine machine) { - return Invoker.Invoke("LockCar", 500, 100, machine.IsCanceled,machine.IsManualSwapSucc, + return Invoker.Invoke("LockCar", 500, 100, machine.IsCanceled, machine.IsManualSwapSucc, () => machine.VelLockFlag, () => { Task result = TBoxApi.LockCarManyTimes(machine.RfidReadModel.VelVin); @@ -128,7 +131,7 @@ public class SwapDoneState : IState public InvokeStatus ExistRadar(SwappingStateMachine machine) { - return Invoker.Invoke("wait exist radar", 1000, 5, machine.IsCanceled,machine.IsManualSwapSucc, + return Invoker.Invoke("wait exist radar", 1000, 5, machine.IsCanceled, machine.IsManualSwapSucc, () => machine.RadarOutFlag, () => { if (PlcApi.ExitRadar()) diff --git a/Service/MyTask/SwapOrderReportCloudTask.cs b/Service/MyTask/SwapOrderReportCloudTask.cs index e34bb99..1921544 100644 --- a/Service/MyTask/SwapOrderReportCloudTask.cs +++ b/Service/MyTask/SwapOrderReportCloudTask.cs @@ -29,7 +29,7 @@ public class SwapOrderReportCloudTask : ITask public int Interval() { - return 1000 * 20; + return 1000 * 3; } public void Handle()