diff --git a/Service/Execute/Step/CancelState.cs b/Service/Execute/Step/CancelState.cs index bfa31d7..ae1daae 100644 --- a/Service/Execute/Step/CancelState.cs +++ b/Service/Execute/Step/CancelState.cs @@ -41,14 +41,21 @@ public class CancelState : IState _CommonMgr.UpdateSwapOrder(machine); } - _manualOperationRecordRepository.Insert(new ManualOperationRecord() + var manualOperationRecord = new ManualOperationRecord() { Type = 2, CreatedBy = UserManager.Account, UpdatedBy = UserManager.Account, Operator = machine.OperateModel.Operator, Reason = machine.OperateModel.Reason, - }); + }; + if (machine.SwapOrder != null) + { + manualOperationRecord.SwapOrderSn = machine.SwapOrder.Sn; + } + + + _manualOperationRecordRepository.Insert(manualOperationRecord); machine.Reset(); diff --git a/Service/Execute/Step/ManualSuccState.cs b/Service/Execute/Step/ManualSuccState.cs index be10007..ddebcbe 100644 --- a/Service/Execute/Step/ManualSuccState.cs +++ b/Service/Execute/Step/ManualSuccState.cs @@ -41,14 +41,23 @@ public class ManualSuccState : IState _CommonMgr.UpdateSwapOrder(machine); } - _manualOperationRecordRepository.Insert(new ManualOperationRecord() + var manualOperationRecord = new ManualOperationRecord() { - Type = 2, + Type = 1, CreatedBy = UserManager.Account, UpdatedBy = UserManager.Account, Operator = machine.OperateModel.Operator, Reason = machine.OperateModel.Reason, - }); + + }; + if (machine.SwapOrder != null) + { + manualOperationRecord.SwapOrderSn = machine.SwapOrder.Sn; + } + + _manualOperationRecordRepository.Insert(manualOperationRecord); + ; + machine.Reset(); } catch (Exception e) diff --git a/Service/Station/SwapOrderService.cs b/Service/Station/SwapOrderService.cs index 2f2f27e..f1c04d8 100644 --- a/Service/Station/SwapOrderService.cs +++ b/Service/Station/SwapOrderService.cs @@ -55,7 +55,7 @@ public class SwapOrderService : BaseServices SwapOrderReportCloudRepository.QueryListByClause(i => i.CloudReportStatus < 100 && i.SwapOrderId == id); if (list.Count <= 0) - { + { return Result.Fail("当前换电订单不满足上报云平台的条件"); }