From 9f4a0e363fe9d03d67f9a4d828ce5d598e8fe779 Mon Sep 17 00:00:00 2001 From: lhiven <236881222@qq.com> Date: Fri, 21 Jun 2024 09:23:11 +0800 Subject: [PATCH] =?UTF-8?q?1=20=E3=80=81=E5=A2=9E=E5=8A=A0=E6=8C=91?= =?UTF-8?q?=E6=96=99=E7=95=8C=E9=9D=A2=202=E3=80=81GRR=E5=92=8C=E6=8E=92?= =?UTF-8?q?=E6=96=99=E9=87=87=E7=94=A8=E7=9C=9F=E5=AE=9E=E7=9A=84=E4=BA=8C?= =?UTF-8?q?=E7=BB=B4=E7=A0=81=203=E3=80=81=E4=BF=AE=E5=A4=8D=E5=BD=93?= =?UTF-8?q?=E4=B8=80=E6=8B=8D=E5=8D=81=E5=85=AD=E5=A4=B1=E8=B4=A5=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E5=AE=9A=E6=8B=8D=E5=A6=82=E6=9E=9C=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E5=90=8E=E4=BA=A7=E5=93=81=E6=B2=A1=E6=9C=89=E8=A2=AB=E5=8F=96?= =?UTF-8?q?=E8=B5=B0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Flow/NormalFlow/DischargeFlow.cs | 2 +- Rs.DeweyTester/Flow/NormalFlow/GrrFlow.cs | 3 +- Rs.DeweyTester/Flow/SubFlow/StockTakeFlow.cs | 3 +- Rs.DeweyTester/FormMain.cs | 16 +- Rs.DeweyTester/Rs.DeweyTester.csproj | 9 + .../SysConfig/SelectProductFrm.Designer.cs | 162 ++++++++++++++++++ Rs.DeweyTester/SysConfig/SelectProductFrm.cs | 20 +++ .../SysConfig/SelectProductFrm.resx | 126 ++++++++++++++ 8 files changed, 337 insertions(+), 4 deletions(-) create mode 100644 Rs.DeweyTester/SysConfig/SelectProductFrm.Designer.cs create mode 100644 Rs.DeweyTester/SysConfig/SelectProductFrm.cs create mode 100644 Rs.DeweyTester/SysConfig/SelectProductFrm.resx diff --git a/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs b/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs index 256274d..b5f8577 100644 --- a/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs +++ b/Rs.DeweyTester/Flow/NormalFlow/DischargeFlow.cs @@ -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; } diff --git a/Rs.DeweyTester/Flow/NormalFlow/GrrFlow.cs b/Rs.DeweyTester/Flow/NormalFlow/GrrFlow.cs index 5a3fb88..7e73dad 100644 --- a/Rs.DeweyTester/Flow/NormalFlow/GrrFlow.cs +++ b/Rs.DeweyTester/Flow/NormalFlow/GrrFlow.cs @@ -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); diff --git a/Rs.DeweyTester/Flow/SubFlow/StockTakeFlow.cs b/Rs.DeweyTester/Flow/SubFlow/StockTakeFlow.cs index 05e5056..da3d34d 100644 --- a/Rs.DeweyTester/Flow/SubFlow/StockTakeFlow.cs +++ b/Rs.DeweyTester/Flow/SubFlow/StockTakeFlow.cs @@ -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); diff --git a/Rs.DeweyTester/FormMain.cs b/Rs.DeweyTester/FormMain.cs index f2e7311..6f390f8 100644 --- a/Rs.DeweyTester/FormMain.cs +++ b/Rs.DeweyTester/FormMain.cs @@ -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) { diff --git a/Rs.DeweyTester/Rs.DeweyTester.csproj b/Rs.DeweyTester/Rs.DeweyTester.csproj index 99e6d32..488365b 100644 --- a/Rs.DeweyTester/Rs.DeweyTester.csproj +++ b/Rs.DeweyTester/Rs.DeweyTester.csproj @@ -187,6 +187,12 @@ FixtureConfig.cs + + Form + + + SelectProductFrm.cs + @@ -556,6 +562,9 @@ RenameIO.cs + + SelectProductFrm.cs + StockConfig.cs diff --git a/Rs.DeweyTester/SysConfig/SelectProductFrm.Designer.cs b/Rs.DeweyTester/SysConfig/SelectProductFrm.Designer.cs new file mode 100644 index 0000000..8b7844e --- /dev/null +++ b/Rs.DeweyTester/SysConfig/SelectProductFrm.Designer.cs @@ -0,0 +1,162 @@ +namespace Rs.MotionPlat.SysConfig +{ + partial class SelectProductFrm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + 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; + } +} \ No newline at end of file diff --git a/Rs.DeweyTester/SysConfig/SelectProductFrm.cs b/Rs.DeweyTester/SysConfig/SelectProductFrm.cs new file mode 100644 index 0000000..c8c4754 --- /dev/null +++ b/Rs.DeweyTester/SysConfig/SelectProductFrm.cs @@ -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(); + } + } +} diff --git a/Rs.DeweyTester/SysConfig/SelectProductFrm.resx b/Rs.DeweyTester/SysConfig/SelectProductFrm.resx new file mode 100644 index 0000000..84955a1 --- /dev/null +++ b/Rs.DeweyTester/SysConfig/SelectProductFrm.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + \ No newline at end of file