From 3e2d655b99b0ddb7c7f799d9d25103d9461648c9 Mon Sep 17 00:00:00 2001 From: lxw Date: Mon, 17 Jun 2024 09:54:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E4=BB=93=E5=AE=8C=E6=88=90=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E5=A2=9E=E5=8A=A0=E5=BE=85=E6=9C=BA=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Service/Execute/Step/ManualSuccState.cs | 2 +- Service/Execute/SwappingStateMachine.cs | 2 ++ Service/Mgr/PlcTaskMgr.cs | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Service/Execute/Step/ManualSuccState.cs b/Service/Execute/Step/ManualSuccState.cs index ddebcbe..dc3f0c3 100644 --- a/Service/Execute/Step/ManualSuccState.cs +++ b/Service/Execute/Step/ManualSuccState.cs @@ -24,7 +24,7 @@ public class ManualSuccState : IState AppInfo.Container.Resolve(); public StateResult Handle(SwappingStateMachine machine) { - _log.Info($"'goto ManualSucc"); + _log.Info($"goto ManualSucc"); try { machine.ManualSwapSuccFlag = false; diff --git a/Service/Execute/SwappingStateMachine.cs b/Service/Execute/SwappingStateMachine.cs index 624a088..49d0ded 100644 --- a/Service/Execute/SwappingStateMachine.cs +++ b/Service/Execute/SwappingStateMachine.cs @@ -282,6 +282,8 @@ public class SwappingStateMachine : IDisposable BusinessSwappingForCloudState = InfoEnum.BusinessSwappingForCloudState.Idle; BusinessSwappingStateUpdateTime = DateTime.Now; ExceptionReason = ExceptionReason.None; + OperateModel = null; + ; //换电实时状态 0：开始 1：成功 2:失败 SwapStatus = null; diff --git a/Service/Mgr/PlcTaskMgr.cs b/Service/Mgr/PlcTaskMgr.cs index c8290ec..318df04 100644 --- a/Service/Mgr/PlcTaskMgr.cs +++ b/Service/Mgr/PlcTaskMgr.cs @@ -32,7 +32,7 @@ public class PlcTaskMgr $"PlcTaskMgr.QueryPlcTask taskNo={taskNo} execute fail readPlcTaskStatus={readPlcTaskStatus}"); throw new Exception("PlcTaskMgr.QueryPlcTask readPlcTaskStatus=" + readPlcTaskStatus); } - else if (9000 == readPlcTaskStatus) + else if (9000 == readPlcTaskStatus || 1001== readPlcTaskStatus ) { isSuccess = true; }