修改选包条件,语音修改

master
赵宝玉 1 month ago
parent 2daa86bb44
commit 4356a3eab8

@ -75,7 +75,7 @@ public class BinInfoRepository : BaseRepository<BinInfo>
} }
// 符合soc不在充电 // 符合soc不在充电
var socList = list.Where(i => i.ChargeStatus == 2 || i.ChargeStatus == 4 ||i.ChargeStatus == 0).ToList(); var socList = list.Where(i => (i.ChargeStatus == 2 || i.ChargeStatus == 4 ||i.ChargeStatus == 0)&&i.Status!=0).ToList();
if (socList.Count <= 0) if (socList.Count <= 0)
{ {
// 符合soc在充电 // 符合soc在充电

@ -48,7 +48,7 @@ public class CarCtrlState : IState
/// <returns></returns> /// <returns></returns>
public InvokeStatus UnLockCar(SwappingStateMachine machine) public InvokeStatus UnLockCar(SwappingStateMachine machine)
{ {
return Invoker.Invoke("UnLockCar", 500, 20, machine.IsCanceled, return Invoker.Invoke("UnLockCar", 500, 10, machine.IsCanceled,
() => machine.VelUnlockFlag, () => () => machine.VelUnlockFlag, () =>
{ {
Task<bool> result = TBoxApi.UnLockCarManyTimes(machine.RfidReadModel.VelVin); Task<bool> result = TBoxApi.UnLockCarManyTimes(machine.RfidReadModel.VelVin);
@ -89,6 +89,6 @@ public class CarCtrlState : IState
}, false, () => { machine.ExceptionReason = ExceptionReason.UnLockCarError; } }, false, () => { machine.ExceptionReason = ExceptionReason.UnLockCarError; }
, 40, InvokeStatus.None); , 10, InvokeStatus.None);
} }
} }

@ -215,9 +215,10 @@ public class SwapDoneState : IState
//_CommonMgr.InsertStep(InfoEnum.BusinessSwappingStep.VelLockFlag, //_CommonMgr.InsertStep(InfoEnum.BusinessSwappingStep.VelLockFlag,
// machine); // machine);
var SoundClient = AppInfo.Container.Resolve<SoundClient>(); var SoundClient = AppInfo.Container.Resolve<SoundClient>();
SoundClient.SoundPlay(SoundEnum.music77);
Thread.Sleep(4000);
SoundClient.SoundPlay(SoundEnum.music76); SoundClient.SoundPlay(SoundEnum.music76);
Thread.Sleep(5000);
SoundClient.SoundPlay(SoundEnum.music77);
machine.BoxCarInfoModel = carInfo.Result; machine.BoxCarInfoModel = carInfo.Result;
SoundApi.PlayOneSound(machine.SwapStatus == (int)InfoEnum.SwapOrderResult.Success SoundApi.PlayOneSound(machine.SwapStatus == (int)InfoEnum.SwapOrderResult.Success

@ -193,7 +193,7 @@ public enum SoundEnum
music91,//[Info("换电开始印尼")] ErrStartSwap, music91,//[Info("换电开始印尼")] ErrStartSwap,
music92,//[Info(" 解锁成功中")] ErrStartSwap, music92,//[Info(" 解锁成功中")] ErrStartSwap,
music93,//[Info(" 解锁成功印尼")] ErrStartSwap, music93,//[Info(" 解锁成功印尼")] ErrStartSwap,
music100,//[Info(" 车辆停放不到位印尼")] ErrStartSwap, music100=100,//[Info(" 车辆停放不到位印尼")] ErrStartSwap,
music101,//[Info(" 车辆停放不到位")] ErrStartSwap, music101,//[Info(" 车辆停放不到位")] ErrStartSwap,
music102,//[Info(" 正在等待车辆连接印尼")] ErrStartSwap, music102,//[Info(" 正在等待车辆连接印尼")] ErrStartSwap,
music103,//[Info(" 正在等待车辆连接")] ErrStartSwap, music103,//[Info(" 正在等待车辆连接")] ErrStartSwap,

Loading…
Cancel
Save