优化启用的第一个治具发送1,其余治具发送0

master
lhiven 1 year ago
parent 479882a0f9
commit 2cf6d2fd3e

@ -156,28 +156,29 @@ namespace Rs.MotionPlat.Flow
EButtonType button =Msgbox.ShowTipDialog(EButtonType.Ok | EButtonType.Cancel, $"Please confim LOT info:{GlobalVar.LotName}\r\n ok click ok button \r\n error click Cancel button"); EButtonType button =Msgbox.ShowTipDialog(EButtonType.Ok | EButtonType.Cancel, $"Please confim LOT info:{GlobalVar.LotName}\r\n ok click ok button \r\n error click Cancel button");
if(button== EButtonType.Ok) if(button== EButtonType.Ok)
{ {
CreateCheckFixtureQueue(6);
List<TestFixture> enableFixtureList = TestFixtureManager.Instance.GetEnableFixtureList();
if (enableFixtureList.Count > 0)
{
int i = 0;
foreach (var fix in enableFixtureList)
{
if (i == 0)
fix.IsFirstFixture = true;
else
fix.IsFirstFixture = false;
i++;
}
}
button = Msgbox.ShowTipDialog(EButtonType.Ok | EButtonType.Cancel, "Are you sure clean data ?\r\n clean click OK\r\n no clean click Cancel"); button = Msgbox.ShowTipDialog(EButtonType.Ok | EButtonType.Cancel, "Are you sure clean data ?\r\n clean click OK\r\n no clean click Cancel");
if(button== EButtonType.Ok) if(button== EButtonType.Ok)
{ {
logInfo = GetClassName() + "选择了OK";
MessageQueue.Instance.Insert(logInfo);
CleanDataEvent?.Invoke(); CleanDataEvent?.Invoke();
//lastFixtureIndex = TestFixtureManager.Instance.GetEnableFixtureList().Select(f => f.Index).Min() - 1; //lastFixtureIndex = TestFixtureManager.Instance.GetEnableFixtureList().Select(f => f.Index).Min() - 1;
CreateCheckFixtureQueue(6);
if(checkFixtureList!=null && checkFixtureList.Count>0)
{
for(int i=0;i<checkFixtureList.Count;i++)
{
if(i==0)
{
TestFixtureManager.Instance.GetTestFixture(checkFixtureList[i]).IsFirstFixture = true;
}
else
{
TestFixtureManager.Instance.GetTestFixture(checkFixtureList[i]).IsFirstFixture = false;
}
}
}
//lastFixtureIndex = checkFixtureList[0] - 1; //lastFixtureIndex = checkFixtureList[0] - 1;
TestFixtureManager.Instance.GetTestFixture(1).ClearData(); TestFixtureManager.Instance.GetTestFixture(1).ClearData();
TestFixtureManager.Instance.GetTestFixture(2).ClearData(); TestFixtureManager.Instance.GetTestFixture(2).ClearData();
@ -192,6 +193,8 @@ namespace Rs.MotionPlat.Flow
} }
else if(button== EButtonType.Cancel) else if(button== EButtonType.Cancel)
{ {
logInfo = GetClassName() + "选择了Cancel";
MessageQueue.Instance.Insert(logInfo);
flowStep = EDischargeFlowStep.; flowStep = EDischargeFlowStep.;
} }

@ -668,8 +668,8 @@ namespace Rs.MotionPlat
private void btnClearData_Click(object sender, EventArgs e) private void btnClearData_Click(object sender, EventArgs e)
{ {
EButtonType btn = Msgbox.ShowTipDialog(EButtonType.Ok | EButtonType.Cancel, "Are you sure to clear data?"); //EButtonType btn = Msgbox.ShowTipDialog(EButtonType.Ok | EButtonType.Cancel, "Are you sure to clear data?");
if(btn== EButtonType.Ok) //if(btn== EButtonType.Ok)
{ {
TestFixtureManager.Instance.GetTestFixture(1).ClearData(); TestFixtureManager.Instance.GetTestFixture(1).ClearData();
TestFixtureManager.Instance.GetTestFixture(2).ClearData(); TestFixtureManager.Instance.GetTestFixture(2).ClearData();

Loading…
Cancel
Save