1、版本号:1.20.24.30

2、修复在特殊时间会向summary文件中多写入一条数据
Eight
lhiven 6 months ago
parent cc54a015f0
commit 498eeaca4d

@ -439,7 +439,7 @@ namespace Rs.MotionPlat.Entitys
/// <summary> /// <summary>
/// 通知治具启动测试 /// 通知治具启动测试
/// </summary> /// </summary>
public void StartTest(string sn="") public void StartTest(TestProduct _product, string sn = "")
{ {
while (true) while (true)
{ {
@ -452,6 +452,7 @@ namespace Rs.MotionPlat.Entitys
Thread.Sleep(100); Thread.Sleep(100);
} }
} }
Product=_product;
//先把侧相机数据清空 //先把侧相机数据清空
if(!GlobalVar.IsSimTest) if(!GlobalVar.IsSimTest)
{ {

@ -252,8 +252,8 @@ namespace Rs.MotionPlat.Flow.SubFlow
{ {
logInfo = $"{GetClassName()} 治具{curFixture.Index}放料完成后抬起,吸嘴{curNozzle.NozzleIndex}把产品SN: {curNozzle.Product.SN} 放入治具{curFixture.Index}"; logInfo = $"{GetClassName()} 治具{curFixture.Index}放料完成后抬起,吸嘴{curNozzle.NozzleIndex}把产品SN: {curNozzle.Product.SN} 放入治具{curFixture.Index}";
MessageQueue.Instance.Insert(logInfo); MessageQueue.Instance.Insert(logInfo);
curFixture.Product = curNozzle.Product; //curFixture.Product = curNozzle.Product;
curFixture.StartTest(); curFixture.StartTest(curNozzle.Product);
curNozzle.Clear(); curNozzle.Clear();
finished = true; finished = true;
flowStep = EFixturePlaceFlowStep.; flowStep = EFixturePlaceFlowStep.;

@ -31,6 +31,6 @@ using System.Runtime.InteropServices;
// //
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值 //可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示: //通过使用 "*",如下所示:
[assembly: AssemblyVersion("1.20.24.29")] [assembly: AssemblyVersion("1.20.24.30")]
//[assembly: AssemblyVersion("1.0.0.0")] //[assembly: AssemblyVersion("1.0.0.0")]
//[assembly: AssemblyFileVersion("1.0.0.0")] //[assembly: AssemblyFileVersion("1.0.0.0")]

@ -79,16 +79,6 @@ namespace Rs.MotionPlat
} }
private void button18_Click(object sender, EventArgs e)
{
Task.Run(() => {
TestFixtureManager.Instance.GetTestFixture(1).StartTest();
});
}
private void button22_Click(object sender, EventArgs e) private void button22_Click(object sender, EventArgs e)
{ {
AxisControl.LoadY2.ComparePulse(1, false); AxisControl.LoadY2.ComparePulse(1, false);
@ -215,7 +205,7 @@ namespace Rs.MotionPlat
private void button11_Click(object sender, EventArgs e) private void button11_Click(object sender, EventArgs e)
{ {
int.TryParse(this.comboBox1.SelectedItem.ToString(), out int fixtureIndex); int.TryParse(this.comboBox1.SelectedItem.ToString(), out int fixtureIndex);
TestFixtureManager.Instance.GetTestFixture(fixtureIndex).StartTest(this.textBox1.Text); TestFixtureManager.Instance.GetTestFixture(fixtureIndex).StartTest(null,this.textBox1.Text);
} }
private void button13_Click(object sender, EventArgs e) private void button13_Click(object sender, EventArgs e)

Loading…
Cancel
Save