本地远程换电 判断修改

master
lxw 6 months ago
parent 83751b84ce
commit a95b50fc38

@ -86,7 +86,7 @@ public class CarPrepareState : IState
return new StateResult() return new StateResult()
{ {
SwappingState = SwappingState.SwapCanStart SwappingState = SwappingState.CarCtrl
}; };
} }
@ -142,6 +142,10 @@ public class CarPrepareState : IState
{ {
return Invoker.Invoke("cloud check vehicle", 500, 20, machine.IsCanceled, return Invoker.Invoke("cloud check vehicle", 500, 20, machine.IsCanceled,
() => machine.CloudVelCheckFlag, () => () => machine.CloudVelCheckFlag, () =>
{
if (StationConstant.StationModel.Remote ==
BaseEnumExtensions.GetEnumByCode<StationConstant.StationModel>(
StaticStationInfo.StationModel))
{ {
int vehicleCheck = -1; int vehicleCheck = -1;
vehicleCheck = CloudApi.VehicleCheck(machine.RfidReadModel, machine.SwapOrder); vehicleCheck = CloudApi.VehicleCheck(machine.RfidReadModel, machine.SwapOrder);
@ -163,6 +167,11 @@ public class CarPrepareState : IState
_CommonMgr.InsertStep(InfoEnum.BusinessSwappingStep.CloudVelCheckFlag, _CommonMgr.InsertStep(InfoEnum.BusinessSwappingStep.CloudVelCheckFlag,
machine); machine);
} }
}
else
{
machine.CloudVelCheckFlag = true;
}
}, () => }, () =>
{ {
// machine.LedTool?.WriteProgramContent(InfoEnum.SwapInfo.ErrorCloudCheck.GetLed()); // machine.LedTool?.WriteProgramContent(InfoEnum.SwapInfo.ErrorCloudCheck.GetLed());

@ -1,8 +1,10 @@
using Entity.Constant;
using Entity.DbModel.Station; using Entity.DbModel.Station;
using HybirdFrameworkCore.Autofac.Attribute; using HybirdFrameworkCore.Autofac.Attribute;
using HybirdFrameworkCore.AutoTask; using HybirdFrameworkCore.AutoTask;
using log4net; using log4net;
using Repository.Station; using Repository.Station;
using Service.Init;
using Service.Mgr; using Service.Mgr;
namespace Service.MyTask; namespace Service.MyTask;
@ -34,7 +36,15 @@ public class SwapOrderReportCloudTask : ITask
{ {
try try
{ {
List<SwapOrderReportCloud> list = ReportCloudRepository.QueryListByClause(i => i.CloudReportStatus == 0); if (StationConstant.StationModel.Local ==
BaseEnumExtensions.GetEnumByCode<StationConstant.StationModel>(
StaticStationInfo.StationModel))
{
return;
}
List<SwapOrderReportCloud>
list = ReportCloudRepository.QueryListByClause(i => i.CloudReportStatus == 0);
SwapOrderMgr.UploadCloud(list, 1); SwapOrderMgr.UploadCloud(list, 1);
} }

Loading…
Cancel
Save