修复周转盘状态显示

master
lhiven 2 years ago
parent 200bb6376b
commit 0d69c825d1

@ -659,7 +659,6 @@ namespace Rs.MotionPlat.Flow
case EWorkFlowStep.: case EWorkFlowStep.:
if (XYCanMove()) if (XYCanMove())
{ {
turnoverOffsetPoint.Reset(); turnoverOffsetPoint.Reset();
tray = null; tray = null;
targetX = 0.0; targetX = 0.0;
@ -1034,13 +1033,14 @@ namespace Rs.MotionPlat.Flow
if (TurnoverFlow.Instance.LoadFinished()) if (TurnoverFlow.Instance.LoadFinished())
{ {
TestCenter.Instance.LoadTestLoadResult(); TestCenter.Instance.LoadTestLoadResult();
LoadAndUnloadTask.Instance.Clear();
MachineManage.Instance.RunState = ERunState.Waiting;
//切换穴位状态 //切换穴位状态
foreach (TurnoverInfo turnoverInfo in testLoadList) foreach (TurnoverInfo turnoverInfo in testLoadList)
{ {
GlobalTray.TurnoverTray.ChangeStatus(turnoverInfo.FromIndex, ESlotStatus.NotHave); GlobalTray.TurnoverTray.ChangeStatus(turnoverInfo.FromIndex+1, ESlotStatus.NotHave);
} }
LoadAndUnloadTask.Instance.Clear();
MachineManage.Instance.RunState = ERunState.Waiting;
//for (int i = 1; i < 9; i++) //for (int i = 1; i < 9; i++)
//{ //{
// GlobalTray.TurnoverTray.ChangeStatus(i, ESlotStatus.NotHave); // GlobalTray.TurnoverTray.ChangeStatus(i, ESlotStatus.NotHave);
@ -1062,12 +1062,13 @@ namespace Rs.MotionPlat.Flow
{ {
//logInfo = string.Join(",",testUnLoadList.Select(t=>t.ToIndex).ToList()); //logInfo = string.Join(",",testUnLoadList.Select(t=>t.ToIndex).ToList());
TestCenter.Instance.LoadTestUnLoadResult(); TestCenter.Instance.LoadTestUnLoadResult();
LoadAndUnloadTask.Instance.Clear();
//切换穴位状态 //切换穴位状态
foreach (TurnoverInfo turnoverInfo in testUnLoadList) foreach (TurnoverInfo turnoverInfo in testUnLoadList)
{ {
GlobalTray.TurnoverTray.ChangeStatus(turnoverInfo.ToIndex, ESlotStatus.Have); GlobalTray.TurnoverTray.ChangeStatus(turnoverInfo.ToIndex+1, ESlotStatus.Have);
} }
LoadAndUnloadTask.Instance.Clear();
//for (int i = 9; i < 17; i++) //for (int i = 9; i < 17; i++)
//{ //{
// GlobalTray.TurnoverTray.ChangeStatus(i, ESlotStatus.Have); // GlobalTray.TurnoverTray.ChangeStatus(i, ESlotStatus.Have);

Loading…
Cancel
Save