1 、增加挑料界面

2、GRR和排料采用真实的二维码
3、修复当一拍十六失败后,定拍如果成功后产品没有被取走的问题
master
lhiven 2 years ago
parent 8a4c044cef
commit 9f4a0e363f

@ -313,7 +313,7 @@ namespace Rs.MotionPlat.Flow
if (fixtureret.Result == EOneGrabSixteenResult.Ok)
{
ret.Change(fixtureret.SN, fixtureret.OffsetX, fixtureret.OffsetY);
takeSlotIndex++;
//takeSlotIndex++;
flowStep = EDischargeFlowStep.;
exit = true;
}

@ -339,7 +339,8 @@ namespace Rs.MotionPlat.Flow
if (Ops.IsOn($"吸料真空{curTakeNozzle.NozzleIndex}检测") || GlobalVar.RunSpace)
{
takedNum++;
curTakeNozzle.Product = new TestProduct() { SN = VirtualBarCode.Code, TestNum = 0 };
//curTakeNozzle.Product = new TestProduct() { SN = VirtualBarCode.Code, TestNum = 0 };
curTakeNozzle.Product = new TestProduct() { SN = vProductResult.SN };
curTakeNozzle.Status = ENozzleStatus.ToTest;
GlobalTray.NozzleTray.ChangeStatus(curTakeNozzle.NozzleIndex, ESlotStatus.Have);
GlobalTray.GrrTray.ChangeStatus(curTakeSlot.Index, ESlotStatus.NotHave);

@ -159,7 +159,8 @@ namespace Rs.MotionPlat.Flow.SubFlow
case EStockTakeFlowStep.:
if (curNozzle.HasProduct()|| GlobalVar.RunSpace)
{
curNozzle.Product = new TestProduct() { SN = VirtualBarCode.Code, TestNum = 0 };
//curNozzle.Product = new TestProduct() { SN = VirtualBarCode.Code, TestNum = 0 };
curNozzle.Product = new TestProduct() { SN = OneGrabSixteenManager.Instance.GetResultBySlotIndex(slotIndex).SN, TestNum = 0 };
curNozzle.Status = ENozzleStatus.ToTest;
//curNozzle.Status = ENozzleStatus.ToUnload;
GlobalTray.NozzleTray.ChangeStatus(curNozzle.NozzleIndex, ESlotStatus.Have);

@ -193,8 +193,10 @@ namespace Rs.MotionPlat
timertc4.Enabled = true;
timertc5.Enabled = true;
timertc6.Enabled = true;
if(GlobalUser.UserName!="")
BindParameter();
if (GlobalUser.UserName!="")
{
txtLotName.Enabled = true;
txtConfig.Enabled = true;
cboxConfigName.Enabled = true;
txtSubLotName.Enabled = true;
@ -205,6 +207,18 @@ namespace Rs.MotionPlat
}
}
void BindParameter()
{
txtLotName.Text = GlobalVar.LotName;
txtConfig.Text = GlobalVar.Config;
cboxConfigName.Enabled = true;
txtSubLotName.Enabled = true;
txtSiteID.Enabled = true;
txtProjectID.Enabled = true;
cboxMtcp.Enabled = true;
cboxNoise.Enabled = true;
}
private void btnWholeHome_Load(object sender, EventArgs e)
{

@ -187,6 +187,12 @@
<Compile Include="SysConfig\FixtureConfig.Designer.cs">
<DependentUpon>FixtureConfig.cs</DependentUpon>
</Compile>
<Compile Include="SysConfig\SelectProductFrm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="SysConfig\SelectProductFrm.Designer.cs">
<DependentUpon>SelectProductFrm.cs</DependentUpon>
</Compile>
<Compile Include="Vision\BaseVision.cs" />
<Compile Include="Vision\FixtureDumpProductVision.cs" />
<Compile Include="Vision\LoadTakeProductVision.cs" />
@ -556,6 +562,9 @@
<EmbeddedResource Include="SysConfig\RenameIO.resx">
<DependentUpon>RenameIO.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="SysConfig\SelectProductFrm.resx">
<DependentUpon>SelectProductFrm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="SysConfig\StockConfig.en-US.resx">
<DependentUpon>StockConfig.cs</DependentUpon>
</EmbeddedResource>

@ -0,0 +1,162 @@
namespace Rs.MotionPlat.SysConfig
{
partial class SelectProductFrm
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.panel1 = new System.Windows.Forms.Panel();
this.panel2 = new System.Windows.Forms.Panel();
this.textBox1 = new System.Windows.Forms.TextBox();
this.btnSelect = new System.Windows.Forms.Button();
this.panel3 = new System.Windows.Forms.Panel();
this.dataGridView1 = new System.Windows.Forms.DataGridView();
this.SlotIndex = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Qrcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.groupBox1.SuspendLayout();
this.panel1.SuspendLayout();
this.panel2.SuspendLayout();
this.panel3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
this.SuspendLayout();
//
// groupBox1
//
this.groupBox1.Controls.Add(this.panel2);
this.groupBox1.Controls.Add(this.panel1);
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Top;
this.groupBox1.ForeColor = System.Drawing.Color.White;
this.groupBox1.Location = new System.Drawing.Point(0, 40);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(528, 162);
this.groupBox1.TabIndex = 3;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "查询参数";
//
// panel1
//
this.panel1.Controls.Add(this.btnSelect);
this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.panel1.Location = new System.Drawing.Point(3, 107);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(522, 52);
this.panel1.TabIndex = 0;
//
// panel2
//
this.panel2.Controls.Add(this.textBox1);
this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel2.Location = new System.Drawing.Point(3, 17);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(522, 90);
this.panel2.TabIndex = 1;
//
// textBox1
//
this.textBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.textBox1.Location = new System.Drawing.Point(0, 0);
this.textBox1.Multiline = true;
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(522, 90);
this.textBox1.TabIndex = 0;
//
// btnSelect
//
this.btnSelect.ForeColor = System.Drawing.Color.Black;
this.btnSelect.Location = new System.Drawing.Point(175, 3);
this.btnSelect.Name = "btnSelect";
this.btnSelect.Size = new System.Drawing.Size(124, 39);
this.btnSelect.TabIndex = 0;
this.btnSelect.Text = "开始挑料";
this.btnSelect.UseVisualStyleBackColor = true;
//
// panel3
//
this.panel3.Controls.Add(this.dataGridView1);
this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel3.Location = new System.Drawing.Point(0, 202);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(528, 503);
this.panel3.TabIndex = 4;
//
// dataGridView1
//
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.SlotIndex,
this.Qrcode});
this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
this.dataGridView1.Location = new System.Drawing.Point(0, 0);
this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.RowTemplate.Height = 23;
this.dataGridView1.Size = new System.Drawing.Size(528, 503);
this.dataGridView1.TabIndex = 0;
//
// SlotIndex
//
this.SlotIndex.HeaderText = "SlotIndex";
this.SlotIndex.Name = "SlotIndex";
//
// Qrcode
//
this.Qrcode.HeaderText = "Qrcode";
this.Qrcode.Name = "Qrcode";
//
// SelectProductFrm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(528, 705);
this.Controls.Add(this.panel3);
this.Controls.Add(this.groupBox1);
this.Name = "SelectProductFrm";
this.Text = "SelectProductFrm";
this.Controls.SetChildIndex(this.groupBox1, 0);
this.Controls.SetChildIndex(this.panel3, 0);
this.groupBox1.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel2.ResumeLayout(false);
this.panel2.PerformLayout();
this.panel3.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.Panel panel2;
private System.Windows.Forms.TextBox textBox1;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Button btnSelect;
private System.Windows.Forms.Panel panel3;
private System.Windows.Forms.DataGridView dataGridView1;
private System.Windows.Forms.DataGridViewTextBoxColumn SlotIndex;
private System.Windows.Forms.DataGridViewTextBoxColumn Qrcode;
}
}

@ -0,0 +1,20 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace Rs.MotionPlat.SysConfig
{
public partial class SelectProductFrm : BaseFormHeader
{
public SelectProductFrm()
{
InitializeComponent();
}
}
}

@ -0,0 +1,126 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="SlotIndex.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Qrcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root>
Loading…
Cancel
Save