lhiven
/
Rs.DeweyTester
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、增加启动设备时清楚数据提示

Browse Source 
2、增加启动设备时log是否修改提示
master
lhiven 1 year ago
parent 0c8cc3744a
commit c963bc2169
2 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File

42
Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs
Unescape Escape View File

@ -140,7 +140,47 @@ namespace Rs.MotionPlat.Flow
switch (flowStep)
{
case EDischargeFlowStep.等待启动:
flowStep = EDischargeFlowStep.工作前准备;
{
//EButtonType button = Msgbox.ShowDialog(EButtonType.Ok | EButtonType.Cancel, "清除 NG料盘 数据 确定清除 选择OK 保留 选择否Cancel");
//if(button== EButtonType.Ok)
//{
// GlobalTray.NgTray.ChangeStatus(ESlotStatus.NotHave);
//}
//button = Msgbox.ShowDialog(EButtonType.Ok | EButtonType.Cancel, "清除 OK料盘 数据 确定清除 选择OK 保留 选择否Cancel");
//if (button == EButtonType.Ok)
//{
// GlobalTray.NgTray.ChangeStatus(ESlotStatus.NotHave);
//}
//EButtonType button = Msgbox.ShowDialog(EButtonType.Ok | EButtonType.Cancel, "请确认 LOT 信息 信息正确 选择OK 信息错误退出重写 选择Cancel");
EButtonType button =Msgbox.ShowDialog(EButtonType.Ok | EButtonType.Cancel, "请确认 LOT信息\r\n信息正确 选择OK\r\n信息错误退出重写 选择Cancel");
if(button== EButtonType.Ok)
{
button = Msgbox.ShowDialog(EButtonType.Ok | EButtonType.Cancel, "是否清除之前数据?\r\n清除点击OK\r\n不清楚点击Cancel");
if(button== EButtonType.Ok)
{
TestFixtureManager.Instance.GetTestFixture(1).ClearData();
TestFixtureManager.Instance.GetTestFixture(2).ClearData();
TestFixtureManager.Instance.GetTestFixture(3).ClearData();
TestFixtureManager.Instance.GetTestFixture(4).ClearData();
TestFixtureManager.Instance.GetTestFixture(5).ClearData();
TestFixtureManager.Instance.GetTestFixture(6).ClearData();
GlobalTray.NgTray.ChangeStatus(ESlotStatus.NotHave);
GlobalTray.RetestTray.ChangeStatus(ESlotStatus.NotHave);
GlobalTray.OkTary.ChangeStatus(ESlotStatus.NotHave);
flowStep = EDischargeFlowStep.工作前准备;
}
else if(button== EButtonType.Cancel)
{
flowStep = EDischargeFlowStep.工作前准备;
}
}
else if(button== EButtonType.Cancel)
{
Ops.Stop();
}
}
//flowStep = EDischargeFlowStep.判断是否需要从料仓取料;
break;
#region 临时屏蔽

12
Rs.DeweyTester/Flow/NormalFlow/Stock2Flow.cs
Unescape Escape View File

@ -56,7 +56,11 @@ namespace Rs.MotionPlat.Flow.NormalFlow
switch (prepareTrayStep)
{
case EPrepareTray2FlowStep.弹出料仓上料:
logInfo = GetClassName() + "准备出仓";
MessageQueue.Instance.Insert(logInfo);
OutStock();
logInfo = GetClassName() + "准备等待进仓";
MessageQueue.Instance.Insert(logInfo);
InStock();
prepareTrayStep = EPrepareTray2FlowStep.上升一层;
break;
@ -70,6 +74,8 @@ namespace Rs.MotionPlat.Flow.NormalFlow
{
if(HasTray())
{
logInfo = GetClassName() + $"当前层:{GetCurrentLayer()}检测到料盘";
MessageQueue.Instance.Insert(logInfo);
Status = EStockStatus.Ready;
MessageQueue.Instance.Insert("ready");
//夹紧料盘
@ -79,6 +85,8 @@ namespace Rs.MotionPlat.Flow.NormalFlow
}
else
{
logInfo = GetClassName() + $"当前层:{GetCurrentLayer()}未检测到料盘";
MessageQueue.Instance.Insert(logInfo);
prepareTrayStep = EPrepareTray2FlowStep.上升一层;
}
}
@ -86,6 +94,8 @@ namespace Rs.MotionPlat.Flow.NormalFlow
{
if (HasTray())
{
logInfo = GetClassName() + $"当前层:{GetCurrentLayer()}检测到料盘";
MessageQueue.Instance.Insert(logInfo);
HoldTray();
GlobalTray.InputTray.ChangeStatus(Controls.ESlotStatus.Have);
Status = EStockStatus.Ready;
@ -94,6 +104,8 @@ namespace Rs.MotionPlat.Flow.NormalFlow
}
else
{
logInfo = GetClassName() + $"当前层:{GetCurrentLayer()}未检测到料盘";
MessageQueue.Instance.Insert(logInfo);
Msgbox.ShowDialog(EButtonType.Retry, "Input料仓处料盘少于2盘，选择重试后弹出料仓", "error", true);
OutStock();
InStock();

Write Preview
Loading…
Cancel
Save