huanneng
/
hn_zw_back_main
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

现场提交，换电大屏bug修改

Browse Source
zw
xjl 5 months ago
parent a90fe81bb6
commit 397f38845e
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File

5
Service/Execute/Mgr/CommonMgr.cs
Unescape View File

@ -42,11 +42,12 @@ public class CommonMgr
var stepModel = new StepModel var stepModel = new StepModel
{ {
StepName = BaseEnumExtensions.GetDescription(step), StepName = BaseEnumExtensions.GetDescription(step),
StepNo = (int)step, StepNo = machine.StepSort,
StartTime = DateTime.Now, StartTime = DateTime.Now,
Status = 1 Status = 1
}; };
machine.StepModel[step.ToString()] = stepModel; machine.StepModel[machine.StepSort.ToString()] = stepModel;
_swapOrderStepService.InsertSwapStepForSwapMain(step, _swapOrderStepService.InsertSwapStepForSwapMain(step,
machine.StepSort++, machine.SwapOrder.Sn); machine.StepSort++, machine.SwapOrder.Sn);

33
Service/Execute/SwappingStateMachine.cs
Unescape View File

@ -70,22 +70,23 @@ public class SwappingStateMachine : IDisposable
public ConcurrentDictionary<string, StepModel> StepModel = public ConcurrentDictionary<string, StepModel> StepModel =
new ConcurrentDictionary<string, StepModel> new ConcurrentDictionary<string, StepModel>
{ {
["1"] = new StepModel { StepNo = 1, Status = 0, StepName = "空闲" }, ["0"] = new StepModel { StepNo = 0, Status = 0, StepName = "空闲" },
["2"] = new StepModel { StepNo = 2, Status = 0, StepName = "车辆到站(入口雷达检测到车辆驶入)" }, ["1"] = new StepModel { StepNo = 1, Status = 0, StepName = "车辆到站(入口雷达检测到车辆驶入)" },
["3"] = new StepModel { StepNo = 3, Status = 0, StepName = "rfid扫描完成" }, ["2"] = new StepModel { StepNo = 2, Status = 0, StepName = "rfid扫描完成" },
["4"] = new StepModel { StepNo = 4, Status = 0, StepName = "云平台车辆认证" }, ["3"] = new StepModel { StepNo = 3, Status = 0, StepName = "云平台车辆认证" },
["5"] = new StepModel { StepNo = 5, Status = 0, StepName = "车辆到位" }, ["4"] = new StepModel { StepNo = 4, Status = 0, StepName = "车辆到位" },
["6"] = new StepModel { StepNo = 6, Status = 0, StepName = "车辆解锁" }, ["5"] = new StepModel { StepNo = 5, Status = 0, StepName = "车辆解锁" },
["7"] = new StepModel { StepNo = 7, Status = 0, StepName = "下发plc选包" }, //["6"] = new StepModel { StepNo = 6, Status = 0, StepName = "下发plc选包" },
["8"] = new StepModel { StepNo = 8, Status = 0, StepName = "开始换电" },
["9"] = new StepModel { StepNo = 9, Status = 0, StepName = "拆旧电池完成" }, ["6"] = new StepModel { StepNo = 7, Status = 0, StepName = "开始换电" },
["10"] = new StepModel { StepNo = 10, Status = 0, StepName = "入库旧电池完成" }, ["7"] = new StepModel { StepNo = 8, Status = 0, StepName = "拆旧电池完成" },
["11"] = new StepModel { StepNo = 11, Status = 0, StepName = "搬运新电池完成" }, ["8"] = new StepModel { StepNo = 9, Status = 0, StepName = "入库旧电池完成" },
["12"] = new StepModel { StepNo = 12, Status = 0, StepName = "安装新电池完成" }, ["9"] = new StepModel { StepNo = 10, Status = 0, StepName = "搬运新电池完成" },
["13"] = new StepModel { StepNo = 13, Status = 0, StepName = "安装完成" }, ["10"] = new StepModel { StepNo = 11, Status = 0, StepName = "安装新电池完成" },
["14"] = new StepModel { StepNo = 14, Status = 0, StepName = "车辆上锁" }, ["11"] = new StepModel { StepNo = 12, Status = 0, StepName = "安装完成" },
["15"] = new StepModel { StepNo = 15, Status = 0, StepName = "换电完成(车辆驶离)" }, ["12"] = new StepModel { StepNo = 13, Status = 0, StepName = "车辆上锁" },
["16"] = new StepModel { StepNo = 16, Status = 0, StepName = "换电失败(车辆驶离)" }, ["13"] = new StepModel { StepNo = 14, Status = 0, StepName = "换电完成(车辆驶离)" },
["14"] = new StepModel { StepNo = 15, Status = 0, StepName = "换电失败(车辆驶离)" },
}; };
#region 小步状态 #region 小步状态

Write Preview
Loading…
Cancel
Save