diff --git a/Repository/Station/BinInfoRepository.cs b/Repository/Station/BinInfoRepository.cs index 14ad7df..5c432cd 100644 --- a/Repository/Station/BinInfoRepository.cs +++ b/Repository/Station/BinInfoRepository.cs @@ -29,7 +29,7 @@ public class BinInfoRepository : BaseRepository QueryListByClause(i => i.CacheBinFlag == 0 && i.CanSwapFlag==1 && i.Exists == 1 && i.Status == 1 && i.AmtLock == (int)InfoEnum.AmtBatLockStatus.UnLock, "in_time asc"); - BinInfo? cacheBinBattery = ChooseCacheBinBattery(); + BinInfo? cacheBinBattery = ChooseCacheBinBattery(swapSoc); if (list.Count <= 0 && cacheBinBattery == null) { selectPackDto.Info = InfoEnum.SelectBinStatusInfo.NoBattery; @@ -81,10 +81,10 @@ public class BinInfoRepository : BaseRepository /// 选择缓存仓的电池 /// /// - public BinInfo? ChooseCacheBinBattery() + public BinInfo? ChooseCacheBinBattery(int swapSoc) { return - QueryByClause(i => i.CacheBinFlag == 1 && i.CanSwapFlag==1 && + QueryByClause(i => i.CacheBinFlag == 1 && i.CanSwapFlag==1 && i.Soc >= swapSoc && i.Exists == 1 && i.Status == 1 && i.AmtLock == (int)InfoEnum.AmtBatLockStatus.UnLock); } -} \ No newline at end of file +} diff --git a/Service/Execute/Step/SwapDoneState.cs b/Service/Execute/Step/SwapDoneState.cs index 94f1f46..569641b 100644 --- a/Service/Execute/Step/SwapDoneState.cs +++ b/Service/Execute/Step/SwapDoneState.cs @@ -56,7 +56,6 @@ public class SwapDoneState : IState machine.PlcSwapFlag = true; }); - if (machine.SwapStatus == (int)InfoEnum.SwapOrderResult.Success) { //上传云平台换电状态 @@ -178,4 +177,4 @@ public class SwapDoneState : IState : (int)InfoEnum.SwapInfo.ErrInfoCarLeave); }, false, () => { }, 10, InvokeStatus.None); } -} \ No newline at end of file +}