diff --git a/Rs.SkyLine/Flow/WorkFlow.cs b/Rs.SkyLine/Flow/WorkFlow.cs index 4216a38..14c51e5 100644 --- a/Rs.SkyLine/Flow/WorkFlow.cs +++ b/Rs.SkyLine/Flow/WorkFlow.cs @@ -659,7 +659,6 @@ namespace Rs.MotionPlat.Flow case EWorkFlowStep.到放料位上方: if (XYCanMove()) { - turnoverOffsetPoint.Reset(); tray = null; targetX = 0.0; @@ -1034,13 +1033,14 @@ namespace Rs.MotionPlat.Flow if (TurnoverFlow.Instance.LoadFinished()) { TestCenter.Instance.LoadTestLoadResult(); - LoadAndUnloadTask.Instance.Clear(); - MachineManage.Instance.RunState = ERunState.Waiting; //切换穴位状态 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++) //{ // GlobalTray.TurnoverTray.ChangeStatus(i, ESlotStatus.NotHave); @@ -1062,12 +1062,13 @@ namespace Rs.MotionPlat.Flow { //logInfo = string.Join(",",testUnLoadList.Select(t=>t.ToIndex).ToList()); TestCenter.Instance.LoadTestUnLoadResult(); - LoadAndUnloadTask.Instance.Clear(); //切换穴位状态 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++) //{ // GlobalTray.TurnoverTray.ChangeStatus(i, ESlotStatus.Have);