diff --git a/FacOneZPStation/FrmZP.Designer.cs b/FacOneZPStation/FrmZP.Designer.cs
index f31333a..06c2c67 100644
--- a/FacOneZPStation/FrmZP.Designer.cs
+++ b/FacOneZPStation/FrmZP.Designer.cs
@@ -28,7 +28,6 @@
///
private void InitializeComponent()
{
- this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmZP));
this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
this.button6 = new System.Windows.Forms.Button();
@@ -48,7 +47,7 @@
this.labPName = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
this.labPartNo = new System.Windows.Forms.Label();
- this.timer1 = new System.Windows.Forms.Timer(this.components);
+ this.timer1 = new System.Windows.Forms.Timer();
this.label6 = new System.Windows.Forms.Label();
this.labBadCount = new System.Windows.Forms.Label();
this.labNum = new System.Windows.Forms.Label();
@@ -77,7 +76,7 @@
this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.51529F));
this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.62445F));
this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 32.86026F));
- this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 737F));
+ this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 807F));
this.tableLayoutPanel3.Controls.Add(this.button6, 3, 0);
this.tableLayoutPanel3.Controls.Add(this.button1, 0, 1);
this.tableLayoutPanel3.Controls.Add(this.button5, 2, 1);
@@ -86,14 +85,14 @@
this.tableLayoutPanel3.Controls.Add(this.button2, 1, 1);
this.tableLayoutPanel3.Controls.Add(this.button7, 3, 1);
this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tableLayoutPanel3.Location = new System.Drawing.Point(6, 1224);
- this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.tableLayoutPanel3.Location = new System.Drawing.Point(7, 1400);
+ this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.tableLayoutPanel3.Name = "tableLayoutPanel3";
this.tableLayoutPanel3.RowCount = 2;
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
- this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35F));
- this.tableLayoutPanel3.Size = new System.Drawing.Size(2335, 371);
+ this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F));
+ this.tableLayoutPanel3.Size = new System.Drawing.Size(2546, 423);
this.tableLayoutPanel3.TabIndex = 3;
//
// button6
@@ -102,10 +101,10 @@
this.button6.Dock = System.Windows.Forms.DockStyle.Fill;
this.button6.Font = new System.Drawing.Font("黑体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button6.ForeColor = System.Drawing.Color.Black;
- this.button6.Location = new System.Drawing.Point(1610, 12);
- this.button6.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
+ this.button6.Location = new System.Drawing.Point(1751, 14);
+ this.button6.Margin = new System.Windows.Forms.Padding(14);
this.button6.Name = "button6";
- this.button6.Size = new System.Drawing.Size(712, 161);
+ this.button6.Size = new System.Drawing.Size(781, 183);
this.button6.TabIndex = 7;
this.button6.Text = "手动打印箱单";
this.button6.UseVisualStyleBackColor = false;
@@ -116,10 +115,10 @@
this.button1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
this.button1.Dock = System.Windows.Forms.DockStyle.Fill;
this.button1.Font = new System.Drawing.Font("黑体", 16F);
- this.button1.Location = new System.Drawing.Point(6, 190);
- this.button1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.button1.Location = new System.Drawing.Point(7, 217);
+ this.button1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(523, 176);
+ this.button1.Size = new System.Drawing.Size(568, 200);
this.button1.TabIndex = 6;
this.button1.Text = "打印标签";
this.button1.UseVisualStyleBackColor = false;
@@ -131,10 +130,10 @@
this.button5.Dock = System.Windows.Forms.DockStyle.Fill;
this.button5.Font = new System.Drawing.Font("黑体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button5.ForeColor = System.Drawing.Color.Black;
- this.button5.Location = new System.Drawing.Point(1085, 197);
- this.button5.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
+ this.button5.Location = new System.Drawing.Point(1180, 225);
+ this.button5.Margin = new System.Windows.Forms.Padding(14);
this.button5.Name = "button5";
- this.button5.Size = new System.Drawing.Size(499, 162);
+ this.button5.Size = new System.Drawing.Size(543, 184);
this.button5.TabIndex = 5;
this.button5.Text = "不合格";
this.button5.UseVisualStyleBackColor = false;
@@ -145,10 +144,10 @@
this.button4.BackColor = System.Drawing.Color.RoyalBlue;
this.button4.Dock = System.Windows.Forms.DockStyle.Fill;
this.button4.Font = new System.Drawing.Font("黑体", 16F);
- this.button4.Location = new System.Drawing.Point(541, 5);
- this.button4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.button4.Location = new System.Drawing.Point(589, 6);
+ this.button4.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.button4.Name = "button4";
- this.button4.Size = new System.Drawing.Size(525, 175);
+ this.button4.Size = new System.Drawing.Size(570, 199);
this.button4.TabIndex = 4;
this.button4.Text = "下一计划";
this.button4.UseVisualStyleBackColor = false;
@@ -159,10 +158,10 @@
this.button3.BackColor = System.Drawing.Color.Aqua;
this.button3.Dock = System.Windows.Forms.DockStyle.Fill;
this.button3.Font = new System.Drawing.Font("黑体", 16F);
- this.button3.Location = new System.Drawing.Point(6, 5);
- this.button3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.button3.Location = new System.Drawing.Point(7, 6);
+ this.button3.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.button3.Name = "button3";
- this.button3.Size = new System.Drawing.Size(523, 175);
+ this.button3.Size = new System.Drawing.Size(568, 199);
this.button3.TabIndex = 3;
this.button3.Text = "上一计划";
this.button3.UseVisualStyleBackColor = false;
@@ -174,10 +173,10 @@
this.button2.Dock = System.Windows.Forms.DockStyle.Fill;
this.button2.Font = new System.Drawing.Font("黑体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button2.ForeColor = System.Drawing.Color.Black;
- this.button2.Location = new System.Drawing.Point(548, 197);
- this.button2.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
+ this.button2.Location = new System.Drawing.Point(596, 225);
+ this.button2.Margin = new System.Windows.Forms.Padding(14);
this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(511, 162);
+ this.button2.Size = new System.Drawing.Size(556, 184);
this.button2.TabIndex = 2;
this.button2.Text = "补打标签";
this.button2.UseVisualStyleBackColor = false;
@@ -188,10 +187,10 @@
this.button7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
this.button7.Dock = System.Windows.Forms.DockStyle.Fill;
this.button7.Font = new System.Drawing.Font("黑体", 16F);
- this.button7.Location = new System.Drawing.Point(1603, 190);
- this.button7.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.button7.Location = new System.Drawing.Point(1744, 217);
+ this.button7.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.button7.Name = "button7";
- this.button7.Size = new System.Drawing.Size(726, 176);
+ this.button7.Size = new System.Drawing.Size(795, 200);
this.button7.TabIndex = 8;
this.button7.Text = "补打箱单";
this.button7.UseVisualStyleBackColor = false;
@@ -203,11 +202,11 @@
this.label7.Dock = System.Windows.Forms.DockStyle.Fill;
this.label7.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label7.ForeColor = System.Drawing.Color.White;
- this.label7.Location = new System.Drawing.Point(1275, 3);
+ this.label7.Location = new System.Drawing.Point(1385, 3);
this.label7.Margin = new System.Windows.Forms.Padding(2);
this.label7.Name = "label7";
this.tableLayoutPanel4.SetRowSpan(this.label7, 2);
- this.label7.Size = new System.Drawing.Size(249, 210);
+ this.label7.Size = new System.Drawing.Size(272, 241);
this.label7.TabIndex = 32;
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
@@ -215,10 +214,10 @@
//
this.textBox2.Dock = System.Windows.Forms.DockStyle.Fill;
this.textBox2.Font = new System.Drawing.Font("黑体", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox2.Location = new System.Drawing.Point(368, 111);
- this.textBox2.Margin = new System.Windows.Forms.Padding(4);
+ this.textBox2.Location = new System.Drawing.Point(399, 127);
+ this.textBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(900, 77);
+ this.textBox2.Size = new System.Drawing.Size(979, 87);
this.textBox2.TabIndex = 30;
this.textBox2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox2_KeyDown);
//
@@ -227,10 +226,10 @@
this.label3.Dock = System.Windows.Forms.DockStyle.Fill;
this.label3.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ForeColor = System.Drawing.Color.White;
- this.label3.Location = new System.Drawing.Point(5, 107);
+ this.label3.Location = new System.Drawing.Point(5, 122);
this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(354, 108);
+ this.label3.Size = new System.Drawing.Size(385, 124);
this.label3.TabIndex = 29;
this.label3.Text = "扫描物料条码";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -240,10 +239,10 @@
this.labOrderNo.Dock = System.Windows.Forms.DockStyle.Fill;
this.labOrderNo.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.labOrderNo.ForeColor = System.Drawing.Color.White;
- this.labOrderNo.Location = new System.Drawing.Point(1529, 218);
+ this.labOrderNo.Location = new System.Drawing.Point(1662, 249);
this.labOrderNo.Margin = new System.Windows.Forms.Padding(2);
this.labOrderNo.Name = "labOrderNo";
- this.labOrderNo.Size = new System.Drawing.Size(807, 151);
+ this.labOrderNo.Size = new System.Drawing.Size(887, 174);
this.labOrderNo.TabIndex = 28;
this.labOrderNo.Text = "A64654646464";
this.labOrderNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -254,10 +253,10 @@
this.label4.Dock = System.Windows.Forms.DockStyle.Fill;
this.label4.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ForeColor = System.Drawing.Color.White;
- this.label4.Location = new System.Drawing.Point(1275, 218);
+ this.label4.Location = new System.Drawing.Point(1385, 249);
this.label4.Margin = new System.Windows.Forms.Padding(2);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(249, 151);
+ this.label4.Size = new System.Drawing.Size(272, 174);
this.label4.TabIndex = 27;
this.label4.Text = "计划编号";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -268,10 +267,10 @@
this.labStationNo.Dock = System.Windows.Forms.DockStyle.Fill;
this.labStationNo.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.labStationNo.ForeColor = System.Drawing.Color.White;
- this.labStationNo.Location = new System.Drawing.Point(366, 218);
+ this.labStationNo.Location = new System.Drawing.Point(397, 249);
this.labStationNo.Margin = new System.Windows.Forms.Padding(2);
this.labStationNo.Name = "labStationNo";
- this.labStationNo.Size = new System.Drawing.Size(904, 151);
+ this.labStationNo.Size = new System.Drawing.Size(983, 174);
this.labStationNo.TabIndex = 26;
this.labStationNo.Text = "V253-MF-S后保下部延伸焊接";
this.labStationNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -282,10 +281,10 @@
this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
this.label2.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.ForeColor = System.Drawing.Color.White;
- this.label2.Location = new System.Drawing.Point(3, 218);
+ this.label2.Location = new System.Drawing.Point(3, 249);
this.label2.Margin = new System.Windows.Forms.Padding(2);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(358, 151);
+ this.label2.Size = new System.Drawing.Size(389, 174);
this.label2.TabIndex = 25;
this.label2.Text = "工位名称";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -295,10 +294,10 @@
this.labPName.Dock = System.Windows.Forms.DockStyle.Fill;
this.labPName.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.labPName.ForeColor = System.Drawing.Color.White;
- this.labPName.Location = new System.Drawing.Point(1529, 374);
+ this.labPName.Location = new System.Drawing.Point(1662, 428);
this.labPName.Margin = new System.Windows.Forms.Padding(2);
this.labPName.Name = "labPName";
- this.labPName.Size = new System.Drawing.Size(807, 248);
+ this.labPName.Size = new System.Drawing.Size(887, 284);
this.labPName.TabIndex = 24;
this.labPName.Text = "MF253 MF S后保";
this.labPName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -309,10 +308,10 @@
this.label8.Dock = System.Windows.Forms.DockStyle.Fill;
this.label8.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.ForeColor = System.Drawing.Color.White;
- this.label8.Location = new System.Drawing.Point(1275, 374);
+ this.label8.Location = new System.Drawing.Point(1385, 428);
this.label8.Margin = new System.Windows.Forms.Padding(2);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(249, 248);
+ this.label8.Size = new System.Drawing.Size(272, 284);
this.label8.TabIndex = 23;
this.label8.Text = "产品名称";
this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -323,10 +322,10 @@
this.labPartNo.Dock = System.Windows.Forms.DockStyle.Fill;
this.labPartNo.Font = new System.Drawing.Font("黑体", 42F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.labPartNo.ForeColor = System.Drawing.Color.White;
- this.labPartNo.Location = new System.Drawing.Point(366, 374);
+ this.labPartNo.Location = new System.Drawing.Point(397, 428);
this.labPartNo.Margin = new System.Windows.Forms.Padding(2);
this.labPartNo.Name = "labPartNo";
- this.labPartNo.Size = new System.Drawing.Size(904, 248);
+ this.labPartNo.Size = new System.Drawing.Size(983, 284);
this.labPartNo.TabIndex = 22;
this.labPartNo.Text = "A2530822665";
this.labPartNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -342,10 +341,10 @@
this.label6.Dock = System.Windows.Forms.DockStyle.Fill;
this.label6.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.ForeColor = System.Drawing.Color.White;
- this.label6.Location = new System.Drawing.Point(3, 374);
+ this.label6.Location = new System.Drawing.Point(3, 428);
this.label6.Margin = new System.Windows.Forms.Padding(2);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(358, 248);
+ this.label6.Size = new System.Drawing.Size(389, 284);
this.label6.TabIndex = 21;
this.label6.Text = "产品代码";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -356,10 +355,10 @@
this.labBadCount.Dock = System.Windows.Forms.DockStyle.Fill;
this.labBadCount.Font = new System.Drawing.Font("黑体", 60F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.labBadCount.ForeColor = System.Drawing.Color.Lime;
- this.labBadCount.Location = new System.Drawing.Point(1529, 627);
+ this.labBadCount.Location = new System.Drawing.Point(1662, 717);
this.labBadCount.Margin = new System.Windows.Forms.Padding(2);
this.labBadCount.Name = "labBadCount";
- this.labBadCount.Size = new System.Drawing.Size(807, 451);
+ this.labBadCount.Size = new System.Drawing.Size(887, 515);
this.labBadCount.TabIndex = 20;
this.labBadCount.Text = "0";
this.labBadCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -370,10 +369,10 @@
this.labNum.Dock = System.Windows.Forms.DockStyle.Fill;
this.labNum.Font = new System.Drawing.Font("黑体", 60F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.labNum.ForeColor = System.Drawing.Color.Lime;
- this.labNum.Location = new System.Drawing.Point(366, 627);
+ this.labNum.Location = new System.Drawing.Point(397, 717);
this.labNum.Margin = new System.Windows.Forms.Padding(2);
this.labNum.Name = "labNum";
- this.labNum.Size = new System.Drawing.Size(904, 451);
+ this.labNum.Size = new System.Drawing.Size(983, 515);
this.labNum.TabIndex = 18;
this.labNum.Text = "152/210";
this.labNum.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -384,10 +383,10 @@
this.label10.Dock = System.Windows.Forms.DockStyle.Fill;
this.label10.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label10.ForeColor = System.Drawing.Color.White;
- this.label10.Location = new System.Drawing.Point(3, 627);
+ this.label10.Location = new System.Drawing.Point(3, 717);
this.label10.Margin = new System.Windows.Forms.Padding(2);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(358, 451);
+ this.label10.Size = new System.Drawing.Size(389, 515);
this.label10.TabIndex = 17;
this.label10.Text = "计划/完成数";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -400,7 +399,7 @@
this.label14.Location = new System.Drawing.Point(5, 1);
this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(354, 105);
+ this.label14.Size = new System.Drawing.Size(385, 120);
this.label14.TabIndex = 12;
this.label14.Text = "扫描本体条码";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -409,10 +408,10 @@
//
this.textBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.textBox1.Font = new System.Drawing.Font("黑体", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox1.Location = new System.Drawing.Point(368, 5);
- this.textBox1.Margin = new System.Windows.Forms.Padding(4);
+ this.textBox1.Location = new System.Drawing.Point(399, 6);
+ this.textBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(900, 77);
+ this.textBox1.Size = new System.Drawing.Size(979, 87);
this.textBox1.TabIndex = 13;
this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown);
//
@@ -421,11 +420,11 @@
this.labErrMessage.Dock = System.Windows.Forms.DockStyle.Fill;
this.labErrMessage.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.labErrMessage.ForeColor = System.Drawing.Color.Red;
- this.labErrMessage.Location = new System.Drawing.Point(1531, 1);
+ this.labErrMessage.Location = new System.Drawing.Point(1664, 1);
this.labErrMessage.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.labErrMessage.Name = "labErrMessage";
this.tableLayoutPanel4.SetRowSpan(this.labErrMessage, 2);
- this.labErrMessage.Size = new System.Drawing.Size(803, 214);
+ this.labErrMessage.Size = new System.Drawing.Size(883, 245);
this.labErrMessage.TabIndex = 16;
this.labErrMessage.Text = "条码与产品不匹配，重新扫描";
this.labErrMessage.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -437,9 +436,9 @@
this.tableLayoutPanel4.ColumnCount = 4;
this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 28.52292F));
this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 71.47708F));
- this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 253F));
- this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 810F));
- this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 37F));
+ this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 276F));
+ this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 890F));
+ this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 40F));
this.tableLayoutPanel4.Controls.Add(this.label7, 2, 0);
this.tableLayoutPanel4.Controls.Add(this.textBox2, 1, 1);
this.tableLayoutPanel4.Controls.Add(this.label3, 0, 1);
@@ -459,17 +458,17 @@
this.tableLayoutPanel4.Controls.Add(this.textBox1, 1, 0);
this.tableLayoutPanel4.Controls.Add(this.labErrMessage, 3, 0);
this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 134);
- this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4);
+ this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 154);
+ this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.tableLayoutPanel4.Name = "tableLayoutPanel4";
this.tableLayoutPanel4.RowCount = 5;
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.8932F));
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 17.47573F));
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 40.52419F));
- this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 452F));
- this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35F));
- this.tableLayoutPanel4.Size = new System.Drawing.Size(2339, 1081);
+ this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 517F));
+ this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F));
+ this.tableLayoutPanel4.Size = new System.Drawing.Size(2552, 1235);
this.tableLayoutPanel4.TabIndex = 2;
//
// label12
@@ -478,10 +477,10 @@
this.label12.Dock = System.Windows.Forms.DockStyle.Fill;
this.label12.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label12.ForeColor = System.Drawing.Color.White;
- this.label12.Location = new System.Drawing.Point(1275, 627);
+ this.label12.Location = new System.Drawing.Point(1385, 717);
this.label12.Margin = new System.Windows.Forms.Padding(2);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(249, 451);
+ this.label12.Size = new System.Drawing.Size(272, 515);
this.label12.TabIndex = 19;
this.label12.Text = "不合格数";
this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -491,10 +490,10 @@
this.labTime.BackColor = System.Drawing.Color.Transparent;
this.labTime.Dock = System.Windows.Forms.DockStyle.Fill;
this.labTime.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.labTime.Location = new System.Drawing.Point(1743, 0);
+ this.labTime.Location = new System.Drawing.Point(1898, 0);
this.labTime.Margin = new System.Windows.Forms.Padding(0);
this.labTime.Name = "labTime";
- this.labTime.Size = new System.Drawing.Size(604, 130);
+ this.labTime.Size = new System.Drawing.Size(662, 149);
this.labTime.TabIndex = 7;
this.labTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.labTime.Click += new System.EventHandler(this.labTime_Click);
@@ -508,7 +507,7 @@
this.pictureBox1.Location = new System.Drawing.Point(0, 0);
this.pictureBox1.Margin = new System.Windows.Forms.Padding(0);
this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(315, 130);
+ this.pictureBox1.Size = new System.Drawing.Size(343, 149);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox1.TabIndex = 0;
this.pictureBox1.TabStop = false;
@@ -518,10 +517,10 @@
this.label1.BackColor = System.Drawing.Color.Transparent;
this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
this.label1.Font = new System.Drawing.Font("黑体", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label1.Location = new System.Drawing.Point(315, 0);
+ this.label1.Location = new System.Drawing.Point(343, 0);
this.label1.Margin = new System.Windows.Forms.Padding(0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(1428, 130);
+ this.label1.Size = new System.Drawing.Size(1555, 149);
this.label1.TabIndex = 1;
this.label1.Text = "装配工位信息看板";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -532,7 +531,7 @@
this.tableLayoutPanel2.ColumnCount = 3;
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 18.10651F));
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 81.89349F));
- this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 603F));
+ this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 661F));
this.tableLayoutPanel2.Controls.Add(this.labTime, 2, 0);
this.tableLayoutPanel2.Controls.Add(this.pictureBox1, 0, 0);
this.tableLayoutPanel2.Controls.Add(this.label1, 1, 0);
@@ -542,7 +541,7 @@
this.tableLayoutPanel2.Name = "tableLayoutPanel2";
this.tableLayoutPanel2.RowCount = 1;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
- this.tableLayoutPanel2.Size = new System.Drawing.Size(2347, 130);
+ this.tableLayoutPanel2.Size = new System.Drawing.Size(2560, 149);
this.tableLayoutPanel2.TabIndex = 0;
//
// tableLayoutPanel1
@@ -559,18 +558,18 @@
this.tableLayoutPanel1.RowCount = 3;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10.69692F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 89.30308F));
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 380F));
- this.tableLayoutPanel1.Size = new System.Drawing.Size(2347, 1600);
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 434F));
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(2560, 1829);
this.tableLayoutPanel1.TabIndex = 9;
//
// FrmZP
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(2347, 1600);
+ this.ClientSize = new System.Drawing.Size(2560, 1829);
this.Controls.Add(this.tableLayoutPanel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
- this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.Name = "FrmZP";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "FrmZP";
diff --git a/InjectionPC/FrmMain2411.Designer.cs b/InjectionPC/FrmMain2411.Designer.cs
index 20675e7..c5c1068 100644
--- a/InjectionPC/FrmMain2411.Designer.cs
+++ b/InjectionPC/FrmMain2411.Designer.cs
@@ -184,9 +184,9 @@
this.panel1.Controls.Add(this.panel2);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0);
- this.panel1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel1.Margin = new System.Windows.Forms.Padding(5);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(2347, 1600);
+ this.panel1.Size = new System.Drawing.Size(2560, 1829);
this.panel1.TabIndex = 0;
//
// panel7
@@ -195,10 +195,10 @@
this.panel7.Controls.Add(this.panel8);
this.panel7.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel7.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
- this.panel7.Location = new System.Drawing.Point(0, 147);
- this.panel7.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel7.Location = new System.Drawing.Point(0, 168);
+ this.panel7.Margin = new System.Windows.Forms.Padding(5);
this.panel7.Name = "panel7";
- this.panel7.Size = new System.Drawing.Size(2347, 1453);
+ this.panel7.Size = new System.Drawing.Size(2560, 1661);
this.panel7.TabIndex = 1;
//
// panel23
@@ -206,10 +206,10 @@
this.panel23.Controls.Add(this.panel27);
this.panel23.Controls.Add(this.panel24);
this.panel23.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel23.Location = new System.Drawing.Point(0, 91);
- this.panel23.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel23.Location = new System.Drawing.Point(0, 104);
+ this.panel23.Margin = new System.Windows.Forms.Padding(5);
this.panel23.Name = "panel23";
- this.panel23.Size = new System.Drawing.Size(2347, 1362);
+ this.panel23.Size = new System.Drawing.Size(2560, 1557);
this.panel23.TabIndex = 1;
//
// panel27
@@ -217,10 +217,10 @@
this.panel27.Controls.Add(this.panel29);
this.panel27.Controls.Add(this.panel28);
this.panel27.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel27.Location = new System.Drawing.Point(0, 976);
- this.panel27.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel27.Location = new System.Drawing.Point(0, 1115);
+ this.panel27.Margin = new System.Windows.Forms.Padding(5);
this.panel27.Name = "panel27";
- this.panel27.Size = new System.Drawing.Size(2347, 386);
+ this.panel27.Size = new System.Drawing.Size(2560, 442);
this.panel27.TabIndex = 1;
//
// panel29
@@ -228,10 +228,10 @@
this.panel29.Controls.Add(this.panel31);
this.panel29.Controls.Add(this.panel30);
this.panel29.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel29.Location = new System.Drawing.Point(311, 0);
- this.panel29.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel29.Location = new System.Drawing.Point(339, 0);
+ this.panel29.Margin = new System.Windows.Forms.Padding(5);
this.panel29.Name = "panel29";
- this.panel29.Size = new System.Drawing.Size(2036, 386);
+ this.panel29.Size = new System.Drawing.Size(2221, 442);
this.panel29.TabIndex = 1;
//
// panel31
@@ -239,10 +239,10 @@
this.panel31.Controls.Add(this.panel33);
this.panel31.Controls.Add(this.panel32);
this.panel31.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel31.Location = new System.Drawing.Point(122, 0);
- this.panel31.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel31.Location = new System.Drawing.Point(133, 0);
+ this.panel31.Margin = new System.Windows.Forms.Padding(5);
this.panel31.Name = "panel31";
- this.panel31.Size = new System.Drawing.Size(1914, 386);
+ this.panel31.Size = new System.Drawing.Size(2088, 442);
this.panel31.TabIndex = 1;
//
// panel33
@@ -250,10 +250,10 @@
this.panel33.Controls.Add(this.panel35);
this.panel33.Controls.Add(this.panel34);
this.panel33.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel33.Location = new System.Drawing.Point(122, 0);
- this.panel33.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel33.Location = new System.Drawing.Point(133, 0);
+ this.panel33.Margin = new System.Windows.Forms.Padding(5);
this.panel33.Name = "panel33";
- this.panel33.Size = new System.Drawing.Size(1792, 386);
+ this.panel33.Size = new System.Drawing.Size(1955, 442);
this.panel33.TabIndex = 1;
//
// panel35
@@ -261,9 +261,9 @@
this.panel35.Controls.Add(this.panel37);
this.panel35.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel35.Location = new System.Drawing.Point(0, 0);
- this.panel35.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel35.Margin = new System.Windows.Forms.Padding(5);
this.panel35.Name = "panel35";
- this.panel35.Size = new System.Drawing.Size(1670, 386);
+ this.panel35.Size = new System.Drawing.Size(1822, 442);
this.panel35.TabIndex = 1;
//
// panel37
@@ -271,9 +271,9 @@
this.panel37.Controls.Add(this.panel40);
this.panel37.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel37.Location = new System.Drawing.Point(0, 0);
- this.panel37.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel37.Margin = new System.Windows.Forms.Padding(5);
this.panel37.Name = "panel37";
- this.panel37.Size = new System.Drawing.Size(1670, 386);
+ this.panel37.Size = new System.Drawing.Size(1822, 442);
this.panel37.TabIndex = 1;
//
// panel40
@@ -282,9 +282,9 @@
this.panel40.Controls.Add(this.panel41);
this.panel40.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel40.Location = new System.Drawing.Point(0, 0);
- this.panel40.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel40.Margin = new System.Windows.Forms.Padding(5);
this.panel40.Name = "panel40";
- this.panel40.Size = new System.Drawing.Size(1670, 386);
+ this.panel40.Size = new System.Drawing.Size(1822, 442);
this.panel40.TabIndex = 1;
//
// panel42
@@ -293,9 +293,9 @@
this.panel42.Controls.Add(this.panel43);
this.panel42.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel42.Location = new System.Drawing.Point(0, 0);
- this.panel42.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel42.Margin = new System.Windows.Forms.Padding(5);
this.panel42.Name = "panel42";
- this.panel42.Size = new System.Drawing.Size(1548, 386);
+ this.panel42.Size = new System.Drawing.Size(1689, 442);
this.panel42.TabIndex = 1;
//
// panel39
@@ -312,19 +312,19 @@
this.panel39.Controls.Add(this.label21);
this.panel39.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel39.Location = new System.Drawing.Point(0, 0);
- this.panel39.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel39.Margin = new System.Windows.Forms.Padding(5);
this.panel39.Name = "panel39";
- this.panel39.Size = new System.Drawing.Size(1426, 386);
+ this.panel39.Size = new System.Drawing.Size(1556, 442);
this.panel39.TabIndex = 1;
//
// lbDevState
//
this.lbDevState.BackColor = System.Drawing.Color.DeepSkyBlue;
this.lbDevState.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.lbDevState.Location = new System.Drawing.Point(556, 291);
+ this.lbDevState.Location = new System.Drawing.Point(607, 333);
this.lbDevState.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.lbDevState.Name = "lbDevState";
- this.lbDevState.Size = new System.Drawing.Size(347, 58);
+ this.lbDevState.Size = new System.Drawing.Size(378, 66);
this.lbDevState.TabIndex = 16;
this.lbDevState.Text = "设备已连接";
this.lbDevState.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -333,20 +333,20 @@
// textBox2
//
this.textBox2.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox2.Location = new System.Drawing.Point(220, 291);
- this.textBox2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.textBox2.Location = new System.Drawing.Point(240, 333);
+ this.textBox2.Margin = new System.Windows.Forms.Padding(5);
this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(302, 65);
+ this.textBox2.Size = new System.Drawing.Size(329, 74);
this.textBox2.TabIndex = 13;
//
// label18
//
this.label18.AutoSize = true;
this.label18.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label18.Location = new System.Drawing.Point(40, 304);
+ this.label18.Location = new System.Drawing.Point(44, 347);
this.label18.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label18.Name = "label18";
- this.label18.Size = new System.Drawing.Size(178, 51);
+ this.label18.Size = new System.Drawing.Size(202, 58);
this.label18.TabIndex = 12;
this.label18.Text = "数量：";
//
@@ -354,10 +354,10 @@
//
this.label19.AutoSize = true;
this.label19.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label19.Location = new System.Drawing.Point(606, 178);
+ this.label19.Location = new System.Drawing.Point(661, 203);
this.label19.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label19.Name = "label19";
- this.label19.Size = new System.Drawing.Size(238, 51);
+ this.label19.Size = new System.Drawing.Size(265, 58);
this.label19.TabIndex = 11;
this.label19.Text = "(yyMMdd)";
//
@@ -365,20 +365,20 @@
//
this.textBox1.Enabled = false;
this.textBox1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox1.Location = new System.Drawing.Point(223, 172);
- this.textBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.textBox1.Location = new System.Drawing.Point(243, 197);
+ this.textBox1.Margin = new System.Windows.Forms.Padding(5);
this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(301, 65);
+ this.textBox1.Size = new System.Drawing.Size(328, 74);
this.textBox1.TabIndex = 10;
//
// label20
//
this.label20.AutoSize = true;
this.label20.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label20.Location = new System.Drawing.Point(41, 186);
+ this.label20.Location = new System.Drawing.Point(45, 213);
this.label20.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label20.Name = "label20";
- this.label20.Size = new System.Drawing.Size(178, 51);
+ this.label20.Size = new System.Drawing.Size(202, 58);
this.label20.TabIndex = 9;
this.label20.Text = "批次：";
//
@@ -387,10 +387,10 @@
this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBox2.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.comboBox2.FormattingEnabled = true;
- this.comboBox2.Location = new System.Drawing.Point(223, 63);
- this.comboBox2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.comboBox2.Location = new System.Drawing.Point(243, 72);
+ this.comboBox2.Margin = new System.Windows.Forms.Padding(5);
this.comboBox2.Name = "comboBox2";
- this.comboBox2.Size = new System.Drawing.Size(851, 50);
+ this.comboBox2.Size = new System.Drawing.Size(928, 56);
this.comboBox2.TabIndex = 8;
this.comboBox2.TextChanged += new System.EventHandler(this.comboBox2_TextChanged);
//
@@ -398,10 +398,10 @@
//
this.label21.AutoSize = true;
this.label21.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label21.Location = new System.Drawing.Point(41, 70);
+ this.label21.Location = new System.Drawing.Point(45, 80);
this.label21.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label21.Name = "label21";
- this.label21.Size = new System.Drawing.Size(178, 51);
+ this.label21.Size = new System.Drawing.Size(202, 58);
this.label21.TabIndex = 7;
this.label21.Text = "产品：";
//
@@ -409,10 +409,10 @@
//
this.panel43.Controls.Add(this.label23);
this.panel43.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel43.Location = new System.Drawing.Point(1426, 0);
- this.panel43.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel43.Location = new System.Drawing.Point(1556, 0);
+ this.panel43.Margin = new System.Windows.Forms.Padding(5);
this.panel43.Name = "panel43";
- this.panel43.Size = new System.Drawing.Size(122, 386);
+ this.panel43.Size = new System.Drawing.Size(133, 442);
this.panel43.TabIndex = 0;
//
// label23
@@ -423,7 +423,7 @@
this.label23.Location = new System.Drawing.Point(0, 0);
this.label23.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(122, 386);
+ this.label23.Size = new System.Drawing.Size(133, 442);
this.label23.TabIndex = 0;
this.label23.Text = "手工打印条码";
this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -433,10 +433,10 @@
//
this.panel41.Controls.Add(this.label22);
this.panel41.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel41.Location = new System.Drawing.Point(1548, 0);
- this.panel41.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel41.Location = new System.Drawing.Point(1689, 0);
+ this.panel41.Margin = new System.Windows.Forms.Padding(5);
this.panel41.Name = "panel41";
- this.panel41.Size = new System.Drawing.Size(122, 386);
+ this.panel41.Size = new System.Drawing.Size(133, 442);
this.panel41.TabIndex = 0;
//
// label22
@@ -447,7 +447,7 @@
this.label22.Location = new System.Drawing.Point(0, 0);
this.label22.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label22.Name = "label22";
- this.label22.Size = new System.Drawing.Size(122, 386);
+ this.label22.Size = new System.Drawing.Size(133, 442);
this.label22.TabIndex = 0;
this.label22.Text = "补打条码";
this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -457,10 +457,10 @@
//
this.panel34.Controls.Add(this.label15);
this.panel34.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel34.Location = new System.Drawing.Point(1670, 0);
- this.panel34.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel34.Location = new System.Drawing.Point(1822, 0);
+ this.panel34.Margin = new System.Windows.Forms.Padding(5);
this.panel34.Name = "panel34";
- this.panel34.Size = new System.Drawing.Size(122, 386);
+ this.panel34.Size = new System.Drawing.Size(133, 442);
this.panel34.TabIndex = 0;
//
// label15
@@ -471,7 +471,7 @@
this.label15.Location = new System.Drawing.Point(0, 0);
this.label15.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(122, 386);
+ this.label15.Size = new System.Drawing.Size(133, 442);
this.label15.TabIndex = 0;
this.label15.Text = "删除条码";
this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -482,9 +482,9 @@
this.panel32.Controls.Add(this.label14);
this.panel32.Dock = System.Windows.Forms.DockStyle.Left;
this.panel32.Location = new System.Drawing.Point(0, 0);
- this.panel32.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel32.Margin = new System.Windows.Forms.Padding(5);
this.panel32.Name = "panel32";
- this.panel32.Size = new System.Drawing.Size(122, 386);
+ this.panel32.Size = new System.Drawing.Size(133, 442);
this.panel32.TabIndex = 0;
//
// label14
@@ -495,7 +495,7 @@
this.label14.Location = new System.Drawing.Point(0, 0);
this.label14.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(122, 386);
+ this.label14.Size = new System.Drawing.Size(133, 442);
this.label14.TabIndex = 0;
this.label14.Text = "下一计划";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -506,9 +506,9 @@
this.panel30.Controls.Add(this.label13);
this.panel30.Dock = System.Windows.Forms.DockStyle.Left;
this.panel30.Location = new System.Drawing.Point(0, 0);
- this.panel30.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel30.Margin = new System.Windows.Forms.Padding(5);
this.panel30.Name = "panel30";
- this.panel30.Size = new System.Drawing.Size(122, 386);
+ this.panel30.Size = new System.Drawing.Size(133, 442);
this.panel30.TabIndex = 0;
//
// label13
@@ -519,7 +519,7 @@
this.label13.Location = new System.Drawing.Point(0, 0);
this.label13.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(122, 386);
+ this.label13.Size = new System.Drawing.Size(133, 442);
this.label13.TabIndex = 0;
this.label13.Text = "暂停打印";
this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -530,9 +530,9 @@
this.panel28.Controls.Add(this.label12);
this.panel28.Dock = System.Windows.Forms.DockStyle.Left;
this.panel28.Location = new System.Drawing.Point(0, 0);
- this.panel28.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel28.Margin = new System.Windows.Forms.Padding(5);
this.panel28.Name = "panel28";
- this.panel28.Size = new System.Drawing.Size(311, 386);
+ this.panel28.Size = new System.Drawing.Size(339, 442);
this.panel28.TabIndex = 0;
//
// label12
@@ -544,7 +544,7 @@
this.label12.Location = new System.Drawing.Point(0, 0);
this.label12.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(311, 386);
+ this.label12.Size = new System.Drawing.Size(339, 442);
this.label12.TabIndex = 0;
this.label12.Text = "打印信息：";
this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -555,9 +555,9 @@
this.panel24.Controls.Add(this.panel25);
this.panel24.Dock = System.Windows.Forms.DockStyle.Top;
this.panel24.Location = new System.Drawing.Point(0, 0);
- this.panel24.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel24.Margin = new System.Windows.Forms.Padding(5);
this.panel24.Name = "panel24";
- this.panel24.Size = new System.Drawing.Size(2347, 976);
+ this.panel24.Size = new System.Drawing.Size(2560, 1115);
this.panel24.TabIndex = 0;
//
// panel26
@@ -566,10 +566,10 @@
this.panel26.Controls.Add(this.panel44);
this.panel26.Controls.Add(this.glacialList1);
this.panel26.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel26.Location = new System.Drawing.Point(380, 0);
- this.panel26.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel26.Location = new System.Drawing.Point(415, 0);
+ this.panel26.Margin = new System.Windows.Forms.Padding(5);
this.panel26.Name = "panel26";
- this.panel26.Size = new System.Drawing.Size(1967, 976);
+ this.panel26.Size = new System.Drawing.Size(2145, 1115);
this.panel26.TabIndex = 1;
//
// panel45
@@ -579,19 +579,19 @@
this.panel45.Controls.Add(this.button4);
this.panel45.Controls.Add(this.textBox4);
this.panel45.Controls.Add(this.label25);
- this.panel45.Location = new System.Drawing.Point(296, 592);
- this.panel45.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel45.Location = new System.Drawing.Point(323, 677);
+ this.panel45.Margin = new System.Windows.Forms.Padding(5);
this.panel45.Name = "panel45";
- this.panel45.Size = new System.Drawing.Size(1281, 132);
+ this.panel45.Size = new System.Drawing.Size(1397, 151);
this.panel45.TabIndex = 2;
//
// button3
//
this.button3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button3.Location = new System.Drawing.Point(1129, 38);
- this.button3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.button3.Location = new System.Drawing.Point(1232, 43);
+ this.button3.Margin = new System.Windows.Forms.Padding(5);
this.button3.Name = "button3";
- this.button3.Size = new System.Drawing.Size(147, 52);
+ this.button3.Size = new System.Drawing.Size(160, 59);
this.button3.TabIndex = 5;
this.button3.Text = "取消";
this.button3.UseVisualStyleBackColor = true;
@@ -600,10 +600,10 @@
// button4
//
this.button4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button4.Location = new System.Drawing.Point(951, 38);
- this.button4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.button4.Location = new System.Drawing.Point(1037, 43);
+ this.button4.Margin = new System.Windows.Forms.Padding(5);
this.button4.Name = "button4";
- this.button4.Size = new System.Drawing.Size(147, 52);
+ this.button4.Size = new System.Drawing.Size(160, 59);
this.button4.TabIndex = 4;
this.button4.Text = "切换";
this.button4.UseVisualStyleBackColor = true;
@@ -612,20 +612,20 @@
// textBox4
//
this.textBox4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox4.Location = new System.Drawing.Point(308, 39);
- this.textBox4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.textBox4.Location = new System.Drawing.Point(336, 45);
+ this.textBox4.Margin = new System.Windows.Forms.Padding(5);
this.textBox4.Name = "textBox4";
- this.textBox4.Size = new System.Drawing.Size(605, 49);
+ this.textBox4.Size = new System.Drawing.Size(660, 55);
this.textBox4.TabIndex = 3;
//
// label25
//
this.label25.AutoSize = true;
this.label25.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label25.Location = new System.Drawing.Point(26, 46);
+ this.label25.Location = new System.Drawing.Point(28, 53);
this.label25.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label25.Name = "label25";
- this.label25.Size = new System.Drawing.Size(283, 37);
+ this.label25.Size = new System.Drawing.Size(319, 42);
this.label25.TabIndex = 2;
this.label25.Text = "扫描模具条码：";
this.label25.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -637,19 +637,19 @@
this.panel44.Controls.Add(this.button1);
this.panel44.Controls.Add(this.textBox3);
this.panel44.Controls.Add(this.label24);
- this.panel44.Location = new System.Drawing.Point(330, 318);
- this.panel44.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel44.Location = new System.Drawing.Point(360, 363);
+ this.panel44.Margin = new System.Windows.Forms.Padding(5);
this.panel44.Name = "panel44";
- this.panel44.Size = new System.Drawing.Size(1281, 132);
+ this.panel44.Size = new System.Drawing.Size(1397, 151);
this.panel44.TabIndex = 1;
//
// button2
//
this.button2.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button2.Location = new System.Drawing.Point(1097, 38);
- this.button2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.button2.Location = new System.Drawing.Point(1197, 43);
+ this.button2.Margin = new System.Windows.Forms.Padding(5);
this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(147, 52);
+ this.button2.Size = new System.Drawing.Size(160, 59);
this.button2.TabIndex = 3;
this.button2.Text = "取消";
this.button2.UseVisualStyleBackColor = true;
@@ -658,10 +658,10 @@
// button1
//
this.button1.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button1.Location = new System.Drawing.Point(941, 35);
- this.button1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.button1.Location = new System.Drawing.Point(1027, 40);
+ this.button1.Margin = new System.Windows.Forms.Padding(5);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(147, 52);
+ this.button1.Size = new System.Drawing.Size(160, 59);
this.button1.TabIndex = 2;
this.button1.Text = "确定";
this.button1.UseVisualStyleBackColor = true;
@@ -670,20 +670,20 @@
// textBox3
//
this.textBox3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox3.Location = new System.Drawing.Point(191, 38);
- this.textBox3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.textBox3.Location = new System.Drawing.Point(208, 43);
+ this.textBox3.Margin = new System.Windows.Forms.Padding(5);
this.textBox3.Name = "textBox3";
- this.textBox3.Size = new System.Drawing.Size(676, 49);
+ this.textBox3.Size = new System.Drawing.Size(737, 55);
this.textBox3.TabIndex = 1;
//
// label24
//
this.label24.AutoSize = true;
this.label24.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label24.Location = new System.Drawing.Point(25, 46);
+ this.label24.Location = new System.Drawing.Point(27, 53);
this.label24.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label24.Name = "label24";
- this.label24.Size = new System.Drawing.Size(169, 37);
+ this.label24.Size = new System.Drawing.Size(190, 42);
this.label24.TabIndex = 0;
this.label24.Text = "箱单号：";
this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -754,14 +754,14 @@
this.glacialList1.ItemHeight = 57;
this.glacialList1.ItemWordWrap = false;
this.glacialList1.Location = new System.Drawing.Point(0, 0);
- this.glacialList1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.glacialList1.Margin = new System.Windows.Forms.Padding(5);
this.glacialList1.Name = "glacialList1";
this.glacialList1.Selectable = true;
this.glacialList1.SelectedTextColor = System.Drawing.Color.White;
this.glacialList1.SelectionColor = System.Drawing.Color.DarkBlue;
this.glacialList1.ShowBorder = true;
this.glacialList1.ShowFocusRect = false;
- this.glacialList1.Size = new System.Drawing.Size(1967, 976);
+ this.glacialList1.Size = new System.Drawing.Size(2145, 1115);
this.glacialList1.SortType = GlacialComponents.Controls.SortTypes.InsertionSort;
this.glacialList1.SuperFlatHeaderColor = System.Drawing.Color.White;
this.glacialList1.TabIndex = 0;
@@ -774,9 +774,9 @@
this.panel25.Controls.Add(this.panel36);
this.panel25.Dock = System.Windows.Forms.DockStyle.Left;
this.panel25.Location = new System.Drawing.Point(0, 0);
- this.panel25.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel25.Margin = new System.Windows.Forms.Padding(5);
this.panel25.Name = "panel25";
- this.panel25.Size = new System.Drawing.Size(380, 976);
+ this.panel25.Size = new System.Drawing.Size(415, 1115);
this.panel25.TabIndex = 0;
//
// tableLayoutPanel2
@@ -785,13 +785,13 @@
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel2.Controls.Add(this.panel38, 0, 0);
this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 406);
- this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4);
+ this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 464);
+ this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.tableLayoutPanel2.Name = "tableLayoutPanel2";
this.tableLayoutPanel2.RowCount = 1;
- this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 570F));
- this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 570F));
- this.tableLayoutPanel2.Size = new System.Drawing.Size(380, 570);
+ this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 651F));
+ this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 651F));
+ this.tableLayoutPanel2.Size = new System.Drawing.Size(415, 651);
this.tableLayoutPanel2.TabIndex = 1;
//
// panel38
@@ -801,19 +801,19 @@
this.panel38.Controls.Add(this.label26);
this.panel38.Controls.Add(this.label17);
this.panel38.Controls.Add(this.label16);
- this.panel38.Location = new System.Drawing.Point(5, 4);
- this.panel38.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel38.Location = new System.Drawing.Point(5, 5);
+ this.panel38.Margin = new System.Windows.Forms.Padding(5);
this.panel38.Name = "panel38";
- this.panel38.Size = new System.Drawing.Size(370, 561);
+ this.panel38.Size = new System.Drawing.Size(404, 641);
this.panel38.TabIndex = 1;
//
// label27
//
this.label27.Font = new System.Drawing.Font("宋体", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label27.Location = new System.Drawing.Point(-3, 171);
+ this.label27.Location = new System.Drawing.Point(-3, 195);
this.label27.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label27.Name = "label27";
- this.label27.Size = new System.Drawing.Size(291, 73);
+ this.label27.Size = new System.Drawing.Size(317, 83);
this.label27.TabIndex = 3;
this.label27.Text = "9999";
this.label27.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -822,20 +822,20 @@
//
this.label26.AutoSize = true;
this.label26.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label26.Location = new System.Drawing.Point(0, 136);
+ this.label26.Location = new System.Drawing.Point(0, 155);
this.label26.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label26.Name = "label26";
- this.label26.Size = new System.Drawing.Size(151, 33);
+ this.label26.Size = new System.Drawing.Size(169, 37);
this.label26.TabIndex = 2;
this.label26.Text = "完成数量";
//
// label17
//
this.label17.Font = new System.Drawing.Font("宋体", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label17.Location = new System.Drawing.Point(-3, 49);
+ this.label17.Location = new System.Drawing.Point(-3, 56);
this.label17.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(291, 74);
+ this.label17.Size = new System.Drawing.Size(317, 85);
this.label17.TabIndex = 1;
this.label17.Text = "9999";
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -844,10 +844,10 @@
//
this.label16.AutoSize = true;
this.label16.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label16.Location = new System.Drawing.Point(0, 10);
+ this.label16.Location = new System.Drawing.Point(0, 11);
this.label16.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label16.Name = "label16";
- this.label16.Size = new System.Drawing.Size(151, 33);
+ this.label16.Size = new System.Drawing.Size(169, 37);
this.label16.TabIndex = 0;
this.label16.Text = "计划数量";
//
@@ -856,9 +856,9 @@
this.panel36.Controls.Add(this.tableLayoutPanel1);
this.panel36.Dock = System.Windows.Forms.DockStyle.Top;
this.panel36.Location = new System.Drawing.Point(0, 0);
- this.panel36.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel36.Margin = new System.Windows.Forms.Padding(5);
this.panel36.Name = "panel36";
- this.panel36.Size = new System.Drawing.Size(380, 406);
+ this.panel36.Size = new System.Drawing.Size(415, 464);
this.panel36.TabIndex = 0;
//
// tableLayoutPanel1
@@ -868,12 +868,12 @@
this.tableLayoutPanel1.Controls.Add(this.label11, 0, 0);
this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
- this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4);
+ this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 1;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 406F));
- this.tableLayoutPanel1.Size = new System.Drawing.Size(380, 406);
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 464F));
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(415, 464);
this.tableLayoutPanel1.TabIndex = 1;
//
// label11
@@ -884,7 +884,7 @@
this.label11.Location = new System.Drawing.Point(5, 0);
this.label11.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(370, 406);
+ this.label11.Size = new System.Drawing.Size(403, 464);
this.label11.TabIndex = 0;
this.label11.Text = "打印记录：";
this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -895,9 +895,9 @@
this.panel8.Controls.Add(this.panel9);
this.panel8.Dock = System.Windows.Forms.DockStyle.Top;
this.panel8.Location = new System.Drawing.Point(0, 0);
- this.panel8.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel8.Margin = new System.Windows.Forms.Padding(5);
this.panel8.Name = "panel8";
- this.panel8.Size = new System.Drawing.Size(2347, 91);
+ this.panel8.Size = new System.Drawing.Size(2560, 104);
this.panel8.TabIndex = 0;
//
// panel10
@@ -905,10 +905,10 @@
this.panel10.Controls.Add(this.panel12);
this.panel10.Controls.Add(this.panel11);
this.panel10.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel10.Location = new System.Drawing.Point(380, 0);
- this.panel10.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel10.Location = new System.Drawing.Point(415, 0);
+ this.panel10.Margin = new System.Windows.Forms.Padding(5);
this.panel10.Name = "panel10";
- this.panel10.Size = new System.Drawing.Size(1967, 91);
+ this.panel10.Size = new System.Drawing.Size(2145, 104);
this.panel10.TabIndex = 2;
//
// panel12
@@ -916,10 +916,10 @@
this.panel12.Controls.Add(this.panel16);
this.panel12.Controls.Add(this.panel15);
this.panel12.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel12.Location = new System.Drawing.Point(451, 0);
- this.panel12.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel12.Location = new System.Drawing.Point(492, 0);
+ this.panel12.Margin = new System.Windows.Forms.Padding(5);
this.panel12.Name = "panel12";
- this.panel12.Size = new System.Drawing.Size(1516, 91);
+ this.panel12.Size = new System.Drawing.Size(1653, 104);
this.panel12.TabIndex = 1;
//
// panel16
@@ -927,10 +927,10 @@
this.panel16.Controls.Add(this.panel20);
this.panel16.Controls.Add(this.panel19);
this.panel16.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel16.Location = new System.Drawing.Point(467, 0);
- this.panel16.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel16.Location = new System.Drawing.Point(509, 0);
+ this.panel16.Margin = new System.Windows.Forms.Padding(5);
this.panel16.Name = "panel16";
- this.panel16.Size = new System.Drawing.Size(1049, 91);
+ this.panel16.Size = new System.Drawing.Size(1144, 104);
this.panel16.TabIndex = 1;
//
// panel20
@@ -938,10 +938,10 @@
this.panel20.Controls.Add(this.label10);
this.panel20.Controls.Add(this.panel22);
this.panel20.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel20.Location = new System.Drawing.Point(428, 0);
- this.panel20.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel20.Location = new System.Drawing.Point(467, 0);
+ this.panel20.Margin = new System.Windows.Forms.Padding(5);
this.panel20.Name = "panel20";
- this.panel20.Size = new System.Drawing.Size(621, 91);
+ this.panel20.Size = new System.Drawing.Size(677, 104);
this.panel20.TabIndex = 1;
//
// label10
@@ -949,10 +949,10 @@
this.label10.BackColor = System.Drawing.Color.DeepSkyBlue;
this.label10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label10.Dock = System.Windows.Forms.DockStyle.Fill;
- this.label10.Location = new System.Drawing.Point(341, 0);
+ this.label10.Location = new System.Drawing.Point(372, 0);
this.label10.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(280, 91);
+ this.label10.Size = new System.Drawing.Size(305, 104);
this.label10.TabIndex = 1;
this.label10.Text = "停机录入";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -963,9 +963,9 @@
this.panel22.Controls.Add(this.label9);
this.panel22.Dock = System.Windows.Forms.DockStyle.Left;
this.panel22.Location = new System.Drawing.Point(0, 0);
- this.panel22.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel22.Margin = new System.Windows.Forms.Padding(5);
this.panel22.Name = "panel22";
- this.panel22.Size = new System.Drawing.Size(341, 91);
+ this.panel22.Size = new System.Drawing.Size(372, 104);
this.panel22.TabIndex = 0;
//
// label9
@@ -977,7 +977,7 @@
this.label9.Location = new System.Drawing.Point(0, 0);
this.label9.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(341, 91);
+ this.label9.Size = new System.Drawing.Size(372, 104);
this.label9.TabIndex = 0;
this.label9.Text = "质量录入";
this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -989,9 +989,9 @@
this.panel19.Controls.Add(this.panel21);
this.panel19.Dock = System.Windows.Forms.DockStyle.Left;
this.panel19.Location = new System.Drawing.Point(0, 0);
- this.panel19.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel19.Margin = new System.Windows.Forms.Padding(5);
this.panel19.Name = "panel19";
- this.panel19.Size = new System.Drawing.Size(428, 91);
+ this.panel19.Size = new System.Drawing.Size(467, 104);
this.panel19.TabIndex = 0;
//
// label8
@@ -999,10 +999,10 @@
this.label8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label8.Dock = System.Windows.Forms.DockStyle.Fill;
this.label8.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
- this.label8.Location = new System.Drawing.Point(202, 0);
+ this.label8.Location = new System.Drawing.Point(220, 0);
this.label8.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(226, 91);
+ this.label8.Size = new System.Drawing.Size(247, 104);
this.label8.TabIndex = 1;
this.label8.Text = "cy";
this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1012,9 +1012,9 @@
this.panel21.Controls.Add(this.label7);
this.panel21.Dock = System.Windows.Forms.DockStyle.Left;
this.panel21.Location = new System.Drawing.Point(0, 0);
- this.panel21.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel21.Margin = new System.Windows.Forms.Padding(5);
this.panel21.Name = "panel21";
- this.panel21.Size = new System.Drawing.Size(202, 91);
+ this.panel21.Size = new System.Drawing.Size(220, 104);
this.panel21.TabIndex = 0;
//
// label7
@@ -1026,7 +1026,7 @@
this.label7.Location = new System.Drawing.Point(0, 0);
this.label7.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(202, 91);
+ this.label7.Size = new System.Drawing.Size(220, 104);
this.label7.TabIndex = 0;
this.label7.Text = "用户：";
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1038,19 +1038,19 @@
this.panel15.Controls.Add(this.panel17);
this.panel15.Dock = System.Windows.Forms.DockStyle.Left;
this.panel15.Location = new System.Drawing.Point(0, 0);
- this.panel15.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel15.Margin = new System.Windows.Forms.Padding(5);
this.panel15.Name = "panel15";
- this.panel15.Size = new System.Drawing.Size(467, 91);
+ this.panel15.Size = new System.Drawing.Size(509, 104);
this.panel15.TabIndex = 0;
//
// panel18
//
this.panel18.Controls.Add(this.label6);
this.panel18.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel18.Location = new System.Drawing.Point(202, 0);
- this.panel18.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel18.Location = new System.Drawing.Point(220, 0);
+ this.panel18.Margin = new System.Windows.Forms.Padding(5);
this.panel18.Name = "panel18";
- this.panel18.Size = new System.Drawing.Size(265, 91);
+ this.panel18.Size = new System.Drawing.Size(289, 104);
this.panel18.TabIndex = 1;
//
// label6
@@ -1061,7 +1061,7 @@
this.label6.Location = new System.Drawing.Point(0, 0);
this.label6.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(265, 91);
+ this.label6.Size = new System.Drawing.Size(289, 104);
this.label6.TabIndex = 0;
this.label6.Text = "IM01";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1071,9 +1071,9 @@
this.panel17.Controls.Add(this.label5);
this.panel17.Dock = System.Windows.Forms.DockStyle.Left;
this.panel17.Location = new System.Drawing.Point(0, 0);
- this.panel17.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel17.Margin = new System.Windows.Forms.Padding(5);
this.panel17.Name = "panel17";
- this.panel17.Size = new System.Drawing.Size(202, 91);
+ this.panel17.Size = new System.Drawing.Size(220, 104);
this.panel17.TabIndex = 0;
//
// label5
@@ -1085,7 +1085,7 @@
this.label5.Location = new System.Drawing.Point(0, 0);
this.label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(202, 91);
+ this.label5.Size = new System.Drawing.Size(220, 104);
this.label5.TabIndex = 0;
this.label5.Text = "工位：";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1097,19 +1097,19 @@
this.panel11.Controls.Add(this.panel13);
this.panel11.Dock = System.Windows.Forms.DockStyle.Left;
this.panel11.Location = new System.Drawing.Point(0, 0);
- this.panel11.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel11.Margin = new System.Windows.Forms.Padding(5);
this.panel11.Name = "panel11";
- this.panel11.Size = new System.Drawing.Size(451, 91);
+ this.panel11.Size = new System.Drawing.Size(492, 104);
this.panel11.TabIndex = 0;
//
// panel14
//
this.panel14.Controls.Add(this.comboBox1);
this.panel14.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel14.Location = new System.Drawing.Point(202, 0);
- this.panel14.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel14.Location = new System.Drawing.Point(220, 0);
+ this.panel14.Margin = new System.Windows.Forms.Padding(5);
this.panel14.Name = "panel14";
- this.panel14.Size = new System.Drawing.Size(249, 91);
+ this.panel14.Size = new System.Drawing.Size(272, 104);
this.panel14.TabIndex = 1;
//
// comboBox1
@@ -1122,9 +1122,9 @@
"A班",
"B班"});
this.comboBox1.Location = new System.Drawing.Point(0, 0);
- this.comboBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.comboBox1.Margin = new System.Windows.Forms.Padding(5);
this.comboBox1.Name = "comboBox1";
- this.comboBox1.Size = new System.Drawing.Size(249, 83);
+ this.comboBox1.Size = new System.Drawing.Size(272, 93);
this.comboBox1.TabIndex = 0;
//
// panel13
@@ -1132,9 +1132,9 @@
this.panel13.Controls.Add(this.label4);
this.panel13.Dock = System.Windows.Forms.DockStyle.Left;
this.panel13.Location = new System.Drawing.Point(0, 0);
- this.panel13.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel13.Margin = new System.Windows.Forms.Padding(5);
this.panel13.Name = "panel13";
- this.panel13.Size = new System.Drawing.Size(202, 91);
+ this.panel13.Size = new System.Drawing.Size(220, 104);
this.panel13.TabIndex = 0;
//
// label4
@@ -1146,7 +1146,7 @@
this.label4.Location = new System.Drawing.Point(0, 0);
this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(202, 91);
+ this.label4.Size = new System.Drawing.Size(220, 104);
this.label4.TabIndex = 0;
this.label4.Text = "班组：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1156,9 +1156,9 @@
this.panel9.Controls.Add(this.label3);
this.panel9.Dock = System.Windows.Forms.DockStyle.Left;
this.panel9.Location = new System.Drawing.Point(0, 0);
- this.panel9.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel9.Margin = new System.Windows.Forms.Padding(5);
this.panel9.Name = "panel9";
- this.panel9.Size = new System.Drawing.Size(380, 91);
+ this.panel9.Size = new System.Drawing.Size(415, 104);
this.panel9.TabIndex = 0;
//
// label3
@@ -1170,7 +1170,7 @@
this.label3.Location = new System.Drawing.Point(0, 0);
this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(380, 91);
+ this.label3.Size = new System.Drawing.Size(415, 104);
this.label3.TabIndex = 0;
this.label3.Text = "用户信息：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1181,9 +1181,9 @@
this.panel2.Controls.Add(this.panel3);
this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
this.panel2.Location = new System.Drawing.Point(0, 0);
- this.panel2.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel2.Margin = new System.Windows.Forms.Padding(5);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(2347, 147);
+ this.panel2.Size = new System.Drawing.Size(2560, 168);
this.panel2.TabIndex = 0;
//
// panel4
@@ -1191,10 +1191,10 @@
this.panel4.Controls.Add(this.panel6);
this.panel4.Controls.Add(this.panel5);
this.panel4.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel4.Location = new System.Drawing.Point(311, 0);
- this.panel4.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel4.Location = new System.Drawing.Point(339, 0);
+ this.panel4.Margin = new System.Windows.Forms.Padding(5);
this.panel4.Name = "panel4";
- this.panel4.Size = new System.Drawing.Size(2036, 147);
+ this.panel4.Size = new System.Drawing.Size(2221, 168);
this.panel4.TabIndex = 1;
//
// panel6
@@ -1203,9 +1203,9 @@
this.panel6.Controls.Add(this.label1);
this.panel6.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel6.Location = new System.Drawing.Point(0, 0);
- this.panel6.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel6.Margin = new System.Windows.Forms.Padding(5);
this.panel6.Name = "panel6";
- this.panel6.Size = new System.Drawing.Size(1684, 147);
+ this.panel6.Size = new System.Drawing.Size(1837, 168);
this.panel6.TabIndex = 1;
//
// btnBarCodeWithBox
@@ -1214,7 +1214,7 @@
this.btnBarCodeWithBox.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBarCodeWithBox.Location = new System.Drawing.Point(0, 1);
this.btnBarCodeWithBox.Name = "btnBarCodeWithBox";
- this.btnBarCodeWithBox.Size = new System.Drawing.Size(217, 143);
+ this.btnBarCodeWithBox.Size = new System.Drawing.Size(237, 163);
this.btnBarCodeWithBox.TabIndex = 2;
this.btnBarCodeWithBox.Text = "箱码模式";
this.btnBarCodeWithBox.UseVisualStyleBackColor = false;
@@ -1228,7 +1228,7 @@
this.label1.Location = new System.Drawing.Point(0, 0);
this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(1684, 147);
+ this.label1.Size = new System.Drawing.Size(1837, 168);
this.label1.TabIndex = 0;
this.label1.Text = "注塑车间条码打印";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1237,10 +1237,10 @@
//
this.panel5.Controls.Add(this.label2);
this.panel5.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel5.Location = new System.Drawing.Point(1684, 0);
- this.panel5.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel5.Location = new System.Drawing.Point(1837, 0);
+ this.panel5.Margin = new System.Windows.Forms.Padding(5);
this.panel5.Name = "panel5";
- this.panel5.Size = new System.Drawing.Size(352, 147);
+ this.panel5.Size = new System.Drawing.Size(384, 168);
this.panel5.TabIndex = 0;
//
// label2
@@ -1251,7 +1251,7 @@
this.label2.Location = new System.Drawing.Point(0, 0);
this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(352, 147);
+ this.label2.Size = new System.Drawing.Size(384, 168);
this.label2.TabIndex = 0;
this.label2.Text = "2019-05-29 10:30:31";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1262,19 +1262,19 @@
this.panel3.Controls.Add(this.pictureBox1);
this.panel3.Dock = System.Windows.Forms.DockStyle.Left;
this.panel3.Location = new System.Drawing.Point(0, 0);
- this.panel3.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.panel3.Margin = new System.Windows.Forms.Padding(5);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(311, 147);
+ this.panel3.Size = new System.Drawing.Size(339, 168);
this.panel3.TabIndex = 0;
//
// pictureBox1
//
this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
- this.pictureBox1.Location = new System.Drawing.Point(5, 4);
- this.pictureBox1.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.pictureBox1.Location = new System.Drawing.Point(5, 5);
+ this.pictureBox1.Margin = new System.Windows.Forms.Padding(5);
this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(307, 139);
+ this.pictureBox1.Size = new System.Drawing.Size(335, 159);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox1.TabIndex = 0;
this.pictureBox1.TabStop = false;
@@ -1315,12 +1315,12 @@
//
// FrmMain2411
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(2347, 1600);
+ this.ClientSize = new System.Drawing.Size(2560, 1829);
this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
- this.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+ this.Margin = new System.Windows.Forms.Padding(5);
this.Name = "FrmMain2411";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "FrmMain";
diff --git a/MESClassLibrary/BussinessHelper.cs b/MESClassLibrary/BussinessHelper.cs
index 1fa5d20..b9c3b96 100644
--- a/MESClassLibrary/BussinessHelper.cs
+++ b/MESClassLibrary/BussinessHelper.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Data;
using System.Linq;
using System.Text;
@@ -47,6 +48,7 @@ namespace MESClassLibrary
}
+
///
/// 喷涂质检,当前状态和上一次质检状态是否允许操作判断
///
diff --git a/PaintingPC/FrmQualityOnLine.cs b/PaintingPC/FrmQualityOnLine.cs
index f4ba960..53f221c 100644
--- a/PaintingPC/FrmQualityOnLine.cs
+++ b/PaintingPC/FrmQualityOnLine.cs
@@ -75,33 +75,6 @@ namespace PaintingPC
{ }
}
- ///
- /// 初始化颜色选择框列表
- ///
- ///
- public void InitColor(string stockNo)
- {
- try
- {
- DataTable dt = Function.GetColorByStockNo(stockNo);
- if(dt.Rows.Count == 0)
- {
- lbForeig.Text = $"基础数据-产品颜色菜单未配置[{stockNo}]的颜色信息";
- }
-
- DataRow dr = dt.NewRow();
- dr["Color"] = "";
- dt.Rows.InsertAt(dr, 0);
-
- }
- catch (Exception ex)
- {
- LogHelper.WriteLogManager(ex);
- LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name);
- throw ex;
- }
- }
-
private void TimeGo()
{
System.Timers.Timer timer = new System.Timers.Timer();
diff --git a/PunchingMistake/DLL/Interop.OPCAutomation.dll b/PunchingMistake/DLL/Interop.OPCAutomation.dll
new file mode 100644
index 0000000..f5340f3
Binary files /dev/null and b/PunchingMistake/DLL/Interop.OPCAutomation.dll differ
diff --git a/PunchingMistake/DLL/Interop.grdes6Lib.dll b/PunchingMistake/DLL/Interop.grdes6Lib.dll
new file mode 100644
index 0000000..d267ad0
Binary files /dev/null and b/PunchingMistake/DLL/Interop.grdes6Lib.dll differ
diff --git a/PunchingMistake/DLL/Interop.gregn6Lib.dll b/PunchingMistake/DLL/Interop.gregn6Lib.dll
new file mode 100644
index 0000000..c3448dd
Binary files /dev/null and b/PunchingMistake/DLL/Interop.gregn6Lib.dll differ
diff --git a/PunchingMistake/DLL/PlaySound.dll b/PunchingMistake/DLL/PlaySound.dll
new file mode 100644
index 0000000..e4b0818
Binary files /dev/null and b/PunchingMistake/DLL/PlaySound.dll differ
diff --git a/PunchingMistake/FrmAssemble.Designer.cs b/PunchingMistake/FrmAssemble.Designer.cs
index 23b24ac..7b0e5c6 100644
--- a/PunchingMistake/FrmAssemble.Designer.cs
+++ b/PunchingMistake/FrmAssemble.Designer.cs
@@ -29,6 +29,7 @@ namespace PunchingMistake
///
private void InitializeComponent()
{
+ this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmAssemble));
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.panel1 = new System.Windows.Forms.Panel();
@@ -37,6 +38,7 @@ namespace PunchingMistake
this.panel3 = new System.Windows.Forms.Panel();
this.panel4 = new System.Windows.Forms.Panel();
this.panel12 = new System.Windows.Forms.Panel();
+ this.lbDisplay = new System.Windows.Forms.Label();
this.lbPlanQty = new System.Windows.Forms.Label();
this.label12 = new System.Windows.Forms.Label();
this.panel13 = new System.Windows.Forms.Panel();
@@ -44,7 +46,6 @@ namespace PunchingMistake
this.label13 = new System.Windows.Forms.Label();
this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
this.panel9 = new System.Windows.Forms.Panel();
- this.txtBarCode = new System.Windows.Forms.TextBox();
this.label6 = new System.Windows.Forms.Label();
this.panel8 = new System.Windows.Forms.Panel();
this.lbPartDesc = new System.Windows.Forms.Label();
@@ -60,8 +61,9 @@ namespace PunchingMistake
this.label1 = new System.Windows.Forms.Label();
this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel();
this.panel10 = new System.Windows.Forms.Panel();
- this.button5 = new System.Windows.Forms.Button();
- this.button6 = new System.Windows.Forms.Button();
+ this.lbHint = new System.Windows.Forms.Label();
+ this.btnPlanFinish = new System.Windows.Forms.Button();
+ this.btnPlanSearch = new System.Windows.Forms.Button();
this.btnPlanDown = new System.Windows.Forms.Button();
this.btnPlanUp = new System.Windows.Forms.Button();
this.panel11 = new System.Windows.Forms.Panel();
@@ -72,7 +74,35 @@ namespace PunchingMistake
this.label14 = new System.Windows.Forms.Label();
this.panel15 = new System.Windows.Forms.Panel();
this.panel16 = new System.Windows.Forms.Panel();
- this.lbHint = new System.Windows.Forms.Label();
+ this.panel17 = new System.Windows.Forms.Panel();
+ this.panel18 = new System.Windows.Forms.Panel();
+ this.lbScanState = new System.Windows.Forms.Label();
+ this.txtLinkState = new System.Windows.Forms.Label();
+ this.label30 = new System.Windows.Forms.Label();
+ this.lbIrlsAll = new System.Windows.Forms.Label();
+ this.label27 = new System.Windows.Forms.Label();
+ this.lbIrls = new System.Windows.Forms.Label();
+ this.label29 = new System.Windows.Forms.Label();
+ this.lbRivetRAll = new System.Windows.Forms.Label();
+ this.label19 = new System.Windows.Forms.Label();
+ this.lbRivetR = new System.Windows.Forms.Label();
+ this.label21 = new System.Windows.Forms.Label();
+ this.lbRivetLAll = new System.Windows.Forms.Label();
+ this.label23 = new System.Windows.Forms.Label();
+ this.lbRivetL = new System.Windows.Forms.Label();
+ this.label25 = new System.Windows.Forms.Label();
+ this.lbScrewRAll = new System.Windows.Forms.Label();
+ this.label15 = new System.Windows.Forms.Label();
+ this.lbScrewR = new System.Windows.Forms.Label();
+ this.label17 = new System.Windows.Forms.Label();
+ this.lbScrewLAll = new System.Windows.Forms.Label();
+ this.label8 = new System.Windows.Forms.Label();
+ this.lbScrewL = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
+ this.showHintTimer = new System.Windows.Forms.Timer(this.components);
+ this.LoadScrewTimer = new System.Windows.Forms.Timer(this.components);
+ this.txtBarCode = new System.Windows.Forms.TextBox();
+ this.txtBoxFocusTimer = new System.Windows.Forms.Timer(this.components);
this.tableLayoutPanel1.SuspendLayout();
this.tableLayoutPanel2.SuspendLayout();
this.panel12.SuspendLayout();
@@ -87,6 +117,7 @@ namespace PunchingMistake
this.panel10.SuspendLayout();
this.panel11.SuspendLayout();
this.panel14.SuspendLayout();
+ this.panel18.SuspendLayout();
this.SuspendLayout();
//
// tableLayoutPanel1
@@ -108,26 +139,27 @@ namespace PunchingMistake
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 1;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
- this.tableLayoutPanel1.Size = new System.Drawing.Size(1948, 1346);
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(2125, 1538);
this.tableLayoutPanel1.TabIndex = 0;
//
// panel1
//
this.panel1.BackColor = System.Drawing.Color.DarkCyan;
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel1.Location = new System.Drawing.Point(527, 60);
- this.panel1.Margin = new System.Windows.Forms.Padding(3, 60, 3, 30);
+ this.panel1.Location = new System.Drawing.Point(575, 69);
+ this.panel1.Margin = new System.Windows.Forms.Padding(3, 69, 3, 34);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1, 1256);
+ this.panel1.Size = new System.Drawing.Size(1, 1435);
this.panel1.TabIndex = 0;
//
// panel2
//
this.panel2.BackColor = System.Drawing.Color.DarkCyan;
- this.panel2.Location = new System.Drawing.Point(1423, 60);
- this.panel2.Margin = new System.Windows.Forms.Padding(3, 60, 3, 30);
+ this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.panel2.Location = new System.Drawing.Point(1552, 69);
+ this.panel2.Margin = new System.Windows.Forms.Padding(3, 69, 3, 34);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(1, 1256);
+ this.panel2.Size = new System.Drawing.Size(1, 1435);
this.panel2.TabIndex = 1;
//
// tableLayoutPanel2
@@ -139,23 +171,23 @@ namespace PunchingMistake
this.tableLayoutPanel2.Controls.Add(this.panel12, 0, 1);
this.tableLayoutPanel2.Controls.Add(this.panel13, 0, 3);
this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tableLayoutPanel2.Location = new System.Drawing.Point(529, 3);
+ this.tableLayoutPanel2.Location = new System.Drawing.Point(577, 3);
this.tableLayoutPanel2.Name = "tableLayoutPanel2";
this.tableLayoutPanel2.RowCount = 4;
- this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 110F));
+ this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 126F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 2F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
- this.tableLayoutPanel2.Size = new System.Drawing.Size(888, 1340);
+ this.tableLayoutPanel2.Size = new System.Drawing.Size(969, 1532);
this.tableLayoutPanel2.TabIndex = 2;
//
// panel3
//
this.panel3.BackColor = System.Drawing.Color.DarkCyan;
this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel3.Location = new System.Drawing.Point(3, 727);
+ this.panel3.Location = new System.Drawing.Point(3, 831);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(882, 1);
+ this.panel3.Size = new System.Drawing.Size(963, 1);
this.panel3.TabIndex = 0;
//
// panel4
@@ -165,19 +197,32 @@ namespace PunchingMistake
this.panel4.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel4.Location = new System.Drawing.Point(3, 3);
this.panel4.Name = "panel4";
- this.panel4.Size = new System.Drawing.Size(882, 104);
+ this.panel4.Size = new System.Drawing.Size(963, 120);
this.panel4.TabIndex = 1;
//
// panel12
//
+ this.panel12.Controls.Add(this.lbDisplay);
this.panel12.Controls.Add(this.lbPlanQty);
this.panel12.Controls.Add(this.label12);
this.panel12.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel12.Location = new System.Drawing.Point(3, 113);
+ this.panel12.Location = new System.Drawing.Point(3, 129);
this.panel12.Name = "panel12";
- this.panel12.Size = new System.Drawing.Size(882, 608);
+ this.panel12.Size = new System.Drawing.Size(963, 696);
this.panel12.TabIndex = 2;
//
+ // lbDisplay
+ //
+ this.lbDisplay.AutoSize = true;
+ this.lbDisplay.Font = new System.Drawing.Font("宋体", 108F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbDisplay.ForeColor = System.Drawing.Color.LimeGreen;
+ this.lbDisplay.Location = new System.Drawing.Point(309, 384);
+ this.lbDisplay.Name = "lbDisplay";
+ this.lbDisplay.Size = new System.Drawing.Size(410, 289);
+ this.lbDisplay.TabIndex = 4;
+ this.lbDisplay.Text = "OK";
+ this.lbDisplay.Visible = false;
+ //
// lbPlanQty
//
this.lbPlanQty.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
@@ -186,9 +231,9 @@ namespace PunchingMistake
this.lbPlanQty.BackColor = System.Drawing.Color.Transparent;
this.lbPlanQty.Font = new System.Drawing.Font("宋体", 128.1429F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lbPlanQty.ForeColor = System.Drawing.Color.LightSeaGreen;
- this.lbPlanQty.Location = new System.Drawing.Point(150, 195);
+ this.lbPlanQty.Location = new System.Drawing.Point(164, 223);
this.lbPlanQty.Name = "lbPlanQty";
- this.lbPlanQty.Size = new System.Drawing.Size(575, 300);
+ this.lbPlanQty.Size = new System.Drawing.Size(656, 342);
this.lbPlanQty.TabIndex = 3;
this.lbPlanQty.Text = "150";
//
@@ -198,9 +243,9 @@ namespace PunchingMistake
this.label12.BackColor = System.Drawing.Color.Transparent;
this.label12.Font = new System.Drawing.Font("宋体", 21.85714F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label12.ForeColor = System.Drawing.Color.White;
- this.label12.Location = new System.Drawing.Point(130, 19);
+ this.label12.Location = new System.Drawing.Point(142, 22);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(642, 51);
+ this.label12.Size = new System.Drawing.Size(741, 59);
this.label12.TabIndex = 2;
this.label12.Text = "计划数量/PlannedQuantity";
//
@@ -209,9 +254,9 @@ namespace PunchingMistake
this.panel13.Controls.Add(this.lbCompleteQty);
this.panel13.Controls.Add(this.label13);
this.panel13.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel13.Location = new System.Drawing.Point(3, 729);
+ this.panel13.Location = new System.Drawing.Point(3, 833);
this.panel13.Name = "panel13";
- this.panel13.Size = new System.Drawing.Size(882, 608);
+ this.panel13.Size = new System.Drawing.Size(963, 696);
this.panel13.TabIndex = 3;
//
// lbCompleteQty
@@ -222,9 +267,9 @@ namespace PunchingMistake
this.lbCompleteQty.BackColor = System.Drawing.Color.Transparent;
this.lbCompleteQty.Font = new System.Drawing.Font("宋体", 128.1429F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lbCompleteQty.ForeColor = System.Drawing.Color.LimeGreen;
- this.lbCompleteQty.Location = new System.Drawing.Point(150, 179);
+ this.lbCompleteQty.Location = new System.Drawing.Point(164, 205);
this.lbCompleteQty.Name = "lbCompleteQty";
- this.lbCompleteQty.Size = new System.Drawing.Size(575, 300);
+ this.lbCompleteQty.Size = new System.Drawing.Size(656, 342);
this.lbCompleteQty.TabIndex = 4;
this.lbCompleteQty.Text = "695";
//
@@ -234,9 +279,9 @@ namespace PunchingMistake
this.label13.BackColor = System.Drawing.Color.Transparent;
this.label13.Font = new System.Drawing.Font("宋体", 21.85714F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label13.ForeColor = System.Drawing.Color.White;
- this.label13.Location = new System.Drawing.Point(139, 22);
+ this.label13.Location = new System.Drawing.Point(152, 25);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(668, 51);
+ this.label13.Size = new System.Drawing.Size(771, 59);
this.label13.TabIndex = 3;
this.label13.Text = "完成数量/FinishedQuantity";
//
@@ -250,8 +295,8 @@ namespace PunchingMistake
this.tableLayoutPanel3.Controls.Add(this.panel6, 0, 1);
this.tableLayoutPanel3.Controls.Add(this.panel5, 0, 0);
this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tableLayoutPanel3.Location = new System.Drawing.Point(3, 50);
- this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(3, 50, 3, 3);
+ this.tableLayoutPanel3.Location = new System.Drawing.Point(3, 57);
+ this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(3, 57, 3, 3);
this.tableLayoutPanel3.Name = "tableLayoutPanel3";
this.tableLayoutPanel3.RowCount = 5;
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
@@ -259,7 +304,7 @@ namespace PunchingMistake
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
- this.tableLayoutPanel3.Size = new System.Drawing.Size(518, 1293);
+ this.tableLayoutPanel3.Size = new System.Drawing.Size(566, 1478);
this.tableLayoutPanel3.TabIndex = 3;
//
// panel9
@@ -269,31 +314,21 @@ namespace PunchingMistake
this.panel9.Controls.Add(this.txtBarCode);
this.panel9.Controls.Add(this.label6);
this.panel9.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel9.Location = new System.Drawing.Point(30, 1035);
- this.panel9.Margin = new System.Windows.Forms.Padding(30, 3, 30, 30);
+ this.panel9.Location = new System.Drawing.Point(33, 1183);
+ this.panel9.Margin = new System.Windows.Forms.Padding(33, 3, 33, 34);
this.panel9.Name = "panel9";
- this.panel9.Size = new System.Drawing.Size(458, 228);
+ this.panel9.Size = new System.Drawing.Size(500, 261);
this.panel9.TabIndex = 4;
//
- // txtBarCode
- //
- this.txtBarCode.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.txtBarCode.Location = new System.Drawing.Point(30, 109);
- this.txtBarCode.Multiline = true;
- this.txtBarCode.Name = "txtBarCode";
- this.txtBarCode.Size = new System.Drawing.Size(390, 74);
- this.txtBarCode.TabIndex = 5;
- this.txtBarCode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBarCode_KeyDown);
- //
// label6
//
this.label6.AutoSize = true;
this.label6.BackColor = System.Drawing.Color.Transparent;
this.label6.Font = new System.Drawing.Font("宋体", 15.85714F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.ForeColor = System.Drawing.Color.DarkCyan;
- this.label6.Location = new System.Drawing.Point(23, 51);
+ this.label6.Location = new System.Drawing.Point(25, 58);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(253, 37);
+ this.label6.Size = new System.Drawing.Size(291, 43);
this.label6.TabIndex = 4;
this.label6.Text = "条码/BarCode";
//
@@ -304,10 +339,10 @@ namespace PunchingMistake
this.panel8.Controls.Add(this.lbPartDesc);
this.panel8.Controls.Add(this.label5);
this.panel8.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel8.Location = new System.Drawing.Point(30, 777);
- this.panel8.Margin = new System.Windows.Forms.Padding(30, 3, 30, 30);
+ this.panel8.Location = new System.Drawing.Point(33, 888);
+ this.panel8.Margin = new System.Windows.Forms.Padding(33, 3, 33, 34);
this.panel8.Name = "panel8";
- this.panel8.Size = new System.Drawing.Size(458, 225);
+ this.panel8.Size = new System.Drawing.Size(500, 258);
this.panel8.TabIndex = 3;
//
// lbPartDesc
@@ -316,9 +351,9 @@ namespace PunchingMistake
this.lbPartDesc.BackColor = System.Drawing.Color.Transparent;
this.lbPartDesc.Font = new System.Drawing.Font("宋体", 15.85714F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lbPartDesc.ForeColor = System.Drawing.Color.White;
- this.lbPartDesc.Location = new System.Drawing.Point(32, 115);
+ this.lbPartDesc.Location = new System.Drawing.Point(35, 131);
this.lbPartDesc.Name = "lbPartDesc";
- this.lbPartDesc.Size = new System.Drawing.Size(317, 37);
+ this.lbPartDesc.Size = new System.Drawing.Size(367, 43);
this.lbPartDesc.TabIndex = 4;
this.lbPartDesc.Text = "X247MF S后保冲孔";
//
@@ -328,9 +363,9 @@ namespace PunchingMistake
this.label5.BackColor = System.Drawing.Color.Transparent;
this.label5.Font = new System.Drawing.Font("宋体", 15.85714F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ForeColor = System.Drawing.Color.DarkCyan;
- this.label5.Location = new System.Drawing.Point(23, 51);
+ this.label5.Location = new System.Drawing.Point(25, 58);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(409, 37);
+ this.label5.Size = new System.Drawing.Size(471, 43);
this.label5.TabIndex = 3;
this.label5.Text = "零件描述/Description";
//
@@ -341,10 +376,10 @@ namespace PunchingMistake
this.panel7.Controls.Add(this.lbPart);
this.panel7.Controls.Add(this.label4);
this.panel7.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel7.Location = new System.Drawing.Point(30, 519);
- this.panel7.Margin = new System.Windows.Forms.Padding(30, 3, 30, 30);
+ this.panel7.Location = new System.Drawing.Point(33, 593);
+ this.panel7.Margin = new System.Windows.Forms.Padding(33, 3, 33, 34);
this.panel7.Name = "panel7";
- this.panel7.Size = new System.Drawing.Size(458, 225);
+ this.panel7.Size = new System.Drawing.Size(500, 258);
this.panel7.TabIndex = 2;
//
// lbPart
@@ -353,9 +388,9 @@ namespace PunchingMistake
this.lbPart.BackColor = System.Drawing.Color.Transparent;
this.lbPart.Font = new System.Drawing.Font("宋体", 15.85714F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lbPart.ForeColor = System.Drawing.Color.White;
- this.lbPart.Location = new System.Drawing.Point(32, 114);
+ this.lbPart.Location = new System.Drawing.Point(35, 130);
this.lbPart.Name = "lbPart";
- this.lbPart.Size = new System.Drawing.Size(317, 37);
+ this.lbPart.Size = new System.Drawing.Size(367, 43);
this.lbPart.TabIndex = 3;
this.lbPart.Text = "X247MF S后保冲孔";
//
@@ -365,9 +400,9 @@ namespace PunchingMistake
this.label4.BackColor = System.Drawing.Color.Transparent;
this.label4.Font = new System.Drawing.Font("宋体", 15.85714F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ForeColor = System.Drawing.Color.DarkCyan;
- this.label4.Location = new System.Drawing.Point(23, 47);
+ this.label4.Location = new System.Drawing.Point(25, 54);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(351, 37);
+ this.label4.Size = new System.Drawing.Size(404, 43);
this.label4.TabIndex = 2;
this.label4.Text = "零件号/PartNumber";
//
@@ -378,10 +413,10 @@ namespace PunchingMistake
this.panel6.Controls.Add(this.lbPlan);
this.panel6.Controls.Add(this.label3);
this.panel6.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel6.Location = new System.Drawing.Point(30, 261);
- this.panel6.Margin = new System.Windows.Forms.Padding(30, 3, 30, 30);
+ this.panel6.Location = new System.Drawing.Point(33, 298);
+ this.panel6.Margin = new System.Windows.Forms.Padding(33, 3, 33, 34);
this.panel6.Name = "panel6";
- this.panel6.Size = new System.Drawing.Size(458, 225);
+ this.panel6.Size = new System.Drawing.Size(500, 258);
this.panel6.TabIndex = 1;
//
// lbPlan
@@ -390,9 +425,9 @@ namespace PunchingMistake
this.lbPlan.BackColor = System.Drawing.Color.Transparent;
this.lbPlan.Font = new System.Drawing.Font("宋体", 15.85714F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lbPlan.ForeColor = System.Drawing.Color.White;
- this.lbPlan.Location = new System.Drawing.Point(32, 117);
+ this.lbPlan.Location = new System.Drawing.Point(35, 134);
this.lbPlan.Name = "lbPlan";
- this.lbPlan.Size = new System.Drawing.Size(317, 37);
+ this.lbPlan.Size = new System.Drawing.Size(367, 43);
this.lbPlan.TabIndex = 2;
this.lbPlan.Text = "X247MF S后保冲孔";
//
@@ -402,9 +437,9 @@ namespace PunchingMistake
this.label3.BackColor = System.Drawing.Color.Transparent;
this.label3.Font = new System.Drawing.Font("宋体", 15.85714F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ForeColor = System.Drawing.Color.DarkCyan;
- this.label3.Location = new System.Drawing.Point(23, 46);
+ this.label3.Location = new System.Drawing.Point(25, 53);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(389, 37);
+ this.label3.Size = new System.Drawing.Size(448, 43);
this.label3.TabIndex = 1;
this.label3.Text = "计划编号/PlanNumber";
//
@@ -415,10 +450,10 @@ namespace PunchingMistake
this.panel5.Controls.Add(this.lbStation);
this.panel5.Controls.Add(this.label1);
this.panel5.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel5.Location = new System.Drawing.Point(30, 3);
- this.panel5.Margin = new System.Windows.Forms.Padding(30, 3, 30, 30);
+ this.panel5.Location = new System.Drawing.Point(33, 3);
+ this.panel5.Margin = new System.Windows.Forms.Padding(33, 3, 33, 34);
this.panel5.Name = "panel5";
- this.panel5.Size = new System.Drawing.Size(458, 225);
+ this.panel5.Size = new System.Drawing.Size(500, 258);
this.panel5.TabIndex = 0;
//
// lbStation
@@ -427,9 +462,9 @@ namespace PunchingMistake
this.lbStation.BackColor = System.Drawing.Color.Transparent;
this.lbStation.Font = new System.Drawing.Font("宋体", 15.85714F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lbStation.ForeColor = System.Drawing.Color.White;
- this.lbStation.Location = new System.Drawing.Point(23, 108);
+ this.lbStation.Location = new System.Drawing.Point(25, 123);
this.lbStation.Name = "lbStation";
- this.lbStation.Size = new System.Drawing.Size(317, 37);
+ this.lbStation.Size = new System.Drawing.Size(367, 43);
this.lbStation.TabIndex = 1;
this.lbStation.Text = "X247MF S后保冲孔";
//
@@ -439,9 +474,9 @@ namespace PunchingMistake
this.label1.BackColor = System.Drawing.Color.Transparent;
this.label1.Font = new System.Drawing.Font("宋体", 15.85714F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ForeColor = System.Drawing.Color.DarkCyan;
- this.label1.Location = new System.Drawing.Point(23, 36);
+ this.label1.Location = new System.Drawing.Point(25, 41);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(409, 37);
+ this.label1.Size = new System.Drawing.Size(471, 43);
this.label1.TabIndex = 0;
this.label1.Text = "生产工位/StationCode";
//
@@ -449,70 +484,89 @@ namespace PunchingMistake
//
this.tableLayoutPanel4.ColumnCount = 1;
this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
- this.tableLayoutPanel4.Controls.Add(this.panel10, 0, 4);
+ this.tableLayoutPanel4.Controls.Add(this.panel10, 0, 6);
this.tableLayoutPanel4.Controls.Add(this.panel11, 0, 0);
- this.tableLayoutPanel4.Controls.Add(this.panel14, 0, 2);
+ this.tableLayoutPanel4.Controls.Add(this.panel14, 0, 4);
this.tableLayoutPanel4.Controls.Add(this.panel15, 0, 1);
- this.tableLayoutPanel4.Controls.Add(this.panel16, 0, 3);
+ this.tableLayoutPanel4.Controls.Add(this.panel16, 0, 5);
+ this.tableLayoutPanel4.Controls.Add(this.panel17, 0, 3);
+ this.tableLayoutPanel4.Controls.Add(this.panel18, 0, 2);
this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tableLayoutPanel4.Location = new System.Drawing.Point(1425, 50);
- this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(3, 50, 3, 3);
+ this.tableLayoutPanel4.Location = new System.Drawing.Point(1554, 57);
+ this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(3, 57, 3, 3);
this.tableLayoutPanel4.Name = "tableLayoutPanel4";
- this.tableLayoutPanel4.RowCount = 5;
- this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
+ this.tableLayoutPanel4.RowCount = 7;
+ this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 14.28571F));
+ this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 2F));
+ this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 28.57143F));
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 2F));
- this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 40F));
+ this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 28.57143F));
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 2F));
- this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 40F));
- this.tableLayoutPanel4.Size = new System.Drawing.Size(520, 1293);
+ this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 28.57143F));
+ this.tableLayoutPanel4.Size = new System.Drawing.Size(568, 1478);
this.tableLayoutPanel4.TabIndex = 4;
//
// panel10
//
this.panel10.Controls.Add(this.lbHint);
- this.panel10.Controls.Add(this.button5);
- this.panel10.Controls.Add(this.button6);
+ this.panel10.Controls.Add(this.btnPlanFinish);
+ this.panel10.Controls.Add(this.btnPlanSearch);
this.panel10.Controls.Add(this.btnPlanDown);
this.panel10.Controls.Add(this.btnPlanUp);
this.panel10.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel10.Location = new System.Drawing.Point(3, 779);
+ this.panel10.Location = new System.Drawing.Point(3, 1059);
this.panel10.Name = "panel10";
- this.panel10.Size = new System.Drawing.Size(514, 511);
+ this.panel10.Size = new System.Drawing.Size(562, 416);
this.panel10.TabIndex = 0;
//
- // button5
- //
- this.button5.BackColor = System.Drawing.Color.Red;
- this.button5.Font = new System.Drawing.Font("微软雅黑", 15.85714F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button5.ForeColor = System.Drawing.Color.White;
- this.button5.Location = new System.Drawing.Point(267, 194);
- this.button5.Margin = new System.Windows.Forms.Padding(4);
- this.button5.Name = "button5";
- this.button5.Size = new System.Drawing.Size(240, 88);
- this.button5.TabIndex = 28;
- this.button5.Text = "结束计划";
- this.button5.UseVisualStyleBackColor = false;
- //
- // button6
- //
- this.button6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
- this.button6.Font = new System.Drawing.Font("微软雅黑", 15.85714F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button6.Location = new System.Drawing.Point(14, 194);
- this.button6.Margin = new System.Windows.Forms.Padding(4);
- this.button6.Name = "button6";
- this.button6.Size = new System.Drawing.Size(240, 88);
- this.button6.TabIndex = 27;
- this.button6.Text = "计划查询";
- this.button6.UseVisualStyleBackColor = false;
+ // lbHint
+ //
+ this.lbHint.AllowDrop = true;
+ this.lbHint.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.lbHint.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbHint.ForeColor = System.Drawing.Color.Red;
+ this.lbHint.Location = new System.Drawing.Point(10, 267);
+ this.lbHint.Name = "lbHint";
+ this.lbHint.Size = new System.Drawing.Size(545, 146);
+ this.lbHint.TabIndex = 29;
+ this.lbHint.Text = " ";
+ //
+ // btnPlanFinish
+ //
+ this.btnPlanFinish.BackColor = System.Drawing.Color.Red;
+ this.btnPlanFinish.Font = new System.Drawing.Font("微软雅黑", 15.85714F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnPlanFinish.ForeColor = System.Drawing.Color.White;
+ this.btnPlanFinish.Location = new System.Drawing.Point(293, 152);
+ this.btnPlanFinish.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.btnPlanFinish.Name = "btnPlanFinish";
+ this.btnPlanFinish.Size = new System.Drawing.Size(262, 101);
+ this.btnPlanFinish.TabIndex = 28;
+ this.btnPlanFinish.Text = "结束计划";
+ this.btnPlanFinish.UseVisualStyleBackColor = false;
+ this.btnPlanFinish.Click += new System.EventHandler(this.btnPlanFinish_Click);
+ //
+ // btnPlanSearch
+ //
+ this.btnPlanSearch.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+ this.btnPlanSearch.Font = new System.Drawing.Font("微软雅黑", 15.85714F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnPlanSearch.Location = new System.Drawing.Point(17, 152);
+ this.btnPlanSearch.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.btnPlanSearch.Name = "btnPlanSearch";
+ this.btnPlanSearch.Size = new System.Drawing.Size(262, 101);
+ this.btnPlanSearch.TabIndex = 27;
+ this.btnPlanSearch.Text = "计划查询";
+ this.btnPlanSearch.UseVisualStyleBackColor = false;
+ this.btnPlanSearch.Click += new System.EventHandler(this.btnPlanSearch_Click);
//
// btnPlanDown
//
this.btnPlanDown.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
this.btnPlanDown.Font = new System.Drawing.Font("微软雅黑", 15.85714F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnPlanDown.Location = new System.Drawing.Point(267, 40);
- this.btnPlanDown.Margin = new System.Windows.Forms.Padding(4);
+ this.btnPlanDown.Location = new System.Drawing.Point(293, 21);
+ this.btnPlanDown.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btnPlanDown.Name = "btnPlanDown";
- this.btnPlanDown.Size = new System.Drawing.Size(240, 88);
+ this.btnPlanDown.Size = new System.Drawing.Size(262, 101);
this.btnPlanDown.TabIndex = 23;
this.btnPlanDown.Text = "下一计划";
this.btnPlanDown.UseVisualStyleBackColor = false;
@@ -522,10 +576,10 @@ namespace PunchingMistake
//
this.btnPlanUp.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
this.btnPlanUp.Font = new System.Drawing.Font("微软雅黑", 15.85714F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnPlanUp.Location = new System.Drawing.Point(14, 40);
- this.btnPlanUp.Margin = new System.Windows.Forms.Padding(4);
+ this.btnPlanUp.Location = new System.Drawing.Point(17, 21);
+ this.btnPlanUp.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.btnPlanUp.Name = "btnPlanUp";
- this.btnPlanUp.Size = new System.Drawing.Size(240, 88);
+ this.btnPlanUp.Size = new System.Drawing.Size(262, 101);
this.btnPlanUp.TabIndex = 22;
this.btnPlanUp.Text = "上一计划";
this.btnPlanUp.UseVisualStyleBackColor = false;
@@ -538,7 +592,7 @@ namespace PunchingMistake
this.panel11.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel11.Location = new System.Drawing.Point(3, 3);
this.panel11.Name = "panel11";
- this.panel11.Size = new System.Drawing.Size(514, 251);
+ this.panel11.Size = new System.Drawing.Size(562, 204);
this.panel11.TabIndex = 1;
//
// lbClass
@@ -547,9 +601,9 @@ namespace PunchingMistake
this.lbClass.BackColor = System.Drawing.Color.Transparent;
this.lbClass.Font = new System.Drawing.Font("宋体", 26.14286F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lbClass.ForeColor = System.Drawing.Color.White;
- this.lbClass.Location = new System.Drawing.Point(181, 138);
+ this.lbClass.Location = new System.Drawing.Point(193, 108);
this.lbClass.Name = "lbClass";
- this.lbClass.Size = new System.Drawing.Size(120, 62);
+ this.lbClass.Size = new System.Drawing.Size(135, 70);
this.lbClass.TabIndex = 4;
this.lbClass.Text = "A班";
//
@@ -559,20 +613,21 @@ namespace PunchingMistake
this.label10.BackColor = System.Drawing.Color.Transparent;
this.label10.Font = new System.Drawing.Font("宋体", 15.85714F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label10.ForeColor = System.Drawing.Color.White;
- this.label10.Location = new System.Drawing.Point(67, 19);
+ this.label10.Location = new System.Drawing.Point(73, 22);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(378, 37);
+ this.label10.Size = new System.Drawing.Size(437, 43);
this.label10.TabIndex = 3;
this.label10.Text = "2025-07-15 11:15:14";
+ this.label10.DoubleClick += new System.EventHandler(this.label10_DoubleClick);
//
// panel14
//
this.panel14.Controls.Add(this.lbBadQty);
this.panel14.Controls.Add(this.label14);
this.panel14.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel14.Location = new System.Drawing.Point(3, 262);
+ this.panel14.Location = new System.Drawing.Point(3, 637);
this.panel14.Name = "panel14";
- this.panel14.Size = new System.Drawing.Size(514, 509);
+ this.panel14.Size = new System.Drawing.Size(562, 414);
this.panel14.TabIndex = 2;
//
// lbBadQty
@@ -583,9 +638,9 @@ namespace PunchingMistake
this.lbBadQty.BackColor = System.Drawing.Color.Transparent;
this.lbBadQty.Font = new System.Drawing.Font("宋体", 99.85715F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lbBadQty.ForeColor = System.Drawing.Color.Red;
- this.lbBadQty.Location = new System.Drawing.Point(115, 117);
+ this.lbBadQty.Location = new System.Drawing.Point(130, 106);
this.lbBadQty.Name = "lbBadQty";
- this.lbBadQty.Size = new System.Drawing.Size(215, 234);
+ this.lbBadQty.Size = new System.Drawing.Size(246, 267);
this.lbBadQty.TabIndex = 5;
this.lbBadQty.Text = "0";
//
@@ -595,9 +650,9 @@ namespace PunchingMistake
this.label14.BackColor = System.Drawing.Color.Transparent;
this.label14.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label14.ForeColor = System.Drawing.Color.DarkCyan;
- this.label14.Location = new System.Drawing.Point(7, 17);
+ this.label14.Location = new System.Drawing.Point(8, 19);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(503, 35);
+ this.label14.Size = new System.Drawing.Size(560, 40);
this.label14.TabIndex = 1;
this.label14.Text = "不良数/UnqualifiedQuantity";
//
@@ -605,37 +660,346 @@ namespace PunchingMistake
//
this.panel15.BackColor = System.Drawing.Color.DarkCyan;
this.panel15.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel15.Location = new System.Drawing.Point(3, 260);
+ this.panel15.Location = new System.Drawing.Point(3, 213);
this.panel15.Name = "panel15";
- this.panel15.Size = new System.Drawing.Size(514, 1);
+ this.panel15.Size = new System.Drawing.Size(562, 1);
this.panel15.TabIndex = 3;
//
// panel16
//
this.panel16.BackColor = System.Drawing.Color.DarkCyan;
this.panel16.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel16.Location = new System.Drawing.Point(3, 777);
+ this.panel16.Location = new System.Drawing.Point(3, 1057);
this.panel16.Name = "panel16";
- this.panel16.Size = new System.Drawing.Size(514, 1);
+ this.panel16.Size = new System.Drawing.Size(562, 1);
this.panel16.TabIndex = 4;
//
- // lbHint
+ // panel17
+ //
+ this.panel17.BackColor = System.Drawing.Color.DarkCyan;
+ this.panel17.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.panel17.Location = new System.Drawing.Point(3, 635);
+ this.panel17.Name = "panel17";
+ this.panel17.Size = new System.Drawing.Size(562, 1);
+ this.panel17.TabIndex = 5;
+ //
+ // panel18
+ //
+ this.panel18.Controls.Add(this.lbScanState);
+ this.panel18.Controls.Add(this.txtLinkState);
+ this.panel18.Controls.Add(this.label30);
+ this.panel18.Controls.Add(this.lbIrlsAll);
+ this.panel18.Controls.Add(this.label27);
+ this.panel18.Controls.Add(this.lbIrls);
+ this.panel18.Controls.Add(this.label29);
+ this.panel18.Controls.Add(this.lbRivetRAll);
+ this.panel18.Controls.Add(this.label19);
+ this.panel18.Controls.Add(this.lbRivetR);
+ this.panel18.Controls.Add(this.label21);
+ this.panel18.Controls.Add(this.lbRivetLAll);
+ this.panel18.Controls.Add(this.label23);
+ this.panel18.Controls.Add(this.lbRivetL);
+ this.panel18.Controls.Add(this.label25);
+ this.panel18.Controls.Add(this.lbScrewRAll);
+ this.panel18.Controls.Add(this.label15);
+ this.panel18.Controls.Add(this.lbScrewR);
+ this.panel18.Controls.Add(this.label17);
+ this.panel18.Controls.Add(this.lbScrewLAll);
+ this.panel18.Controls.Add(this.label8);
+ this.panel18.Controls.Add(this.lbScrewL);
+ this.panel18.Controls.Add(this.label2);
+ this.panel18.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.panel18.Location = new System.Drawing.Point(3, 215);
+ this.panel18.Name = "panel18";
+ this.panel18.Size = new System.Drawing.Size(562, 414);
+ this.panel18.TabIndex = 6;
+ //
+ // lbScanState
+ //
+ this.lbScanState.AutoSize = true;
+ this.lbScanState.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbScanState.ForeColor = System.Drawing.Color.White;
+ this.lbScanState.Location = new System.Drawing.Point(37, 373);
+ this.lbScanState.Name = "lbScanState";
+ this.lbScanState.Size = new System.Drawing.Size(97, 37);
+ this.lbScanState.TabIndex = 22;
+ this.lbScanState.Text = " ";
+ //
+ // txtLinkState
+ //
+ this.txtLinkState.AutoSize = true;
+ this.txtLinkState.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtLinkState.ForeColor = System.Drawing.Color.White;
+ this.txtLinkState.Location = new System.Drawing.Point(233, 318);
+ this.txtLinkState.Name = "txtLinkState";
+ this.txtLinkState.Size = new System.Drawing.Size(97, 37);
+ this.txtLinkState.TabIndex = 21;
+ this.txtLinkState.Text = " ";
+ //
+ // label30
+ //
+ this.label30.AutoSize = true;
+ this.label30.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label30.ForeColor = System.Drawing.Color.White;
+ this.label30.Location = new System.Drawing.Point(37, 318);
+ this.label30.Name = "label30";
+ this.label30.Size = new System.Drawing.Size(169, 37);
+ this.label30.TabIndex = 20;
+ this.label30.Text = "连接状态";
+ //
+ // lbIrlsAll
+ //
+ this.lbIrlsAll.AutoSize = true;
+ this.lbIrlsAll.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbIrlsAll.ForeColor = System.Drawing.Color.White;
+ this.lbIrlsAll.Location = new System.Drawing.Point(349, 256);
+ this.lbIrlsAll.Name = "lbIrlsAll";
+ this.lbIrlsAll.Size = new System.Drawing.Size(37, 37);
+ this.lbIrlsAll.TabIndex = 19;
+ this.lbIrlsAll.Text = "0";
+ //
+ // label27
+ //
+ this.label27.AutoSize = true;
+ this.label27.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label27.ForeColor = System.Drawing.Color.White;
+ this.label27.Location = new System.Drawing.Point(289, 256);
+ this.label27.Name = "label27";
+ this.label27.Size = new System.Drawing.Size(37, 37);
+ this.label27.TabIndex = 18;
+ this.label27.Text = "/";
+ //
+ // lbIrls
+ //
+ this.lbIrls.AutoSize = true;
+ this.lbIrls.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbIrls.ForeColor = System.Drawing.Color.White;
+ this.lbIrls.Location = new System.Drawing.Point(233, 256);
+ this.lbIrls.Name = "lbIrls";
+ this.lbIrls.Size = new System.Drawing.Size(37, 37);
+ this.lbIrls.TabIndex = 17;
+ this.lbIrls.Text = "0";
+ //
+ // label29
+ //
+ this.label29.AutoSize = true;
+ this.label29.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label29.ForeColor = System.Drawing.Color.White;
+ this.label29.Location = new System.Drawing.Point(90, 256);
+ this.label29.Name = "label29";
+ this.label29.Size = new System.Drawing.Size(93, 37);
+ this.label29.TabIndex = 16;
+ this.label29.Text = "虹膜";
+ //
+ // lbRivetRAll
+ //
+ this.lbRivetRAll.AutoSize = true;
+ this.lbRivetRAll.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbRivetRAll.ForeColor = System.Drawing.Color.White;
+ this.lbRivetRAll.Location = new System.Drawing.Point(351, 188);
+ this.lbRivetRAll.Name = "lbRivetRAll";
+ this.lbRivetRAll.Size = new System.Drawing.Size(37, 37);
+ this.lbRivetRAll.TabIndex = 15;
+ this.lbRivetRAll.Text = "0";
+ //
+ // label19
+ //
+ this.label19.AutoSize = true;
+ this.label19.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label19.ForeColor = System.Drawing.Color.White;
+ this.label19.Location = new System.Drawing.Point(291, 188);
+ this.label19.Name = "label19";
+ this.label19.Size = new System.Drawing.Size(37, 37);
+ this.label19.TabIndex = 14;
+ this.label19.Text = "/";
+ //
+ // lbRivetR
+ //
+ this.lbRivetR.AutoSize = true;
+ this.lbRivetR.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbRivetR.ForeColor = System.Drawing.Color.White;
+ this.lbRivetR.Location = new System.Drawing.Point(235, 188);
+ this.lbRivetR.Name = "lbRivetR";
+ this.lbRivetR.Size = new System.Drawing.Size(37, 37);
+ this.lbRivetR.TabIndex = 13;
+ this.lbRivetR.Text = "0";
+ //
+ // label21
+ //
+ this.label21.AutoSize = true;
+ this.label21.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label21.ForeColor = System.Drawing.Color.White;
+ this.label21.Location = new System.Drawing.Point(35, 188);
+ this.label21.Name = "label21";
+ this.label21.Size = new System.Drawing.Size(171, 37);
+ this.label21.TabIndex = 12;
+ this.label21.Text = "铆钉(右)";
+ //
+ // lbRivetLAll
+ //
+ this.lbRivetLAll.AutoSize = true;
+ this.lbRivetLAll.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbRivetLAll.ForeColor = System.Drawing.Color.White;
+ this.lbRivetLAll.Location = new System.Drawing.Point(351, 139);
+ this.lbRivetLAll.Name = "lbRivetLAll";
+ this.lbRivetLAll.Size = new System.Drawing.Size(37, 37);
+ this.lbRivetLAll.TabIndex = 11;
+ this.lbRivetLAll.Text = "0";
+ //
+ // label23
+ //
+ this.label23.AutoSize = true;
+ this.label23.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label23.ForeColor = System.Drawing.Color.White;
+ this.label23.Location = new System.Drawing.Point(291, 139);
+ this.label23.Name = "label23";
+ this.label23.Size = new System.Drawing.Size(37, 37);
+ this.label23.TabIndex = 10;
+ this.label23.Text = "/";
+ //
+ // lbRivetL
+ //
+ this.lbRivetL.AutoSize = true;
+ this.lbRivetL.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbRivetL.ForeColor = System.Drawing.Color.White;
+ this.lbRivetL.Location = new System.Drawing.Point(235, 139);
+ this.lbRivetL.Name = "lbRivetL";
+ this.lbRivetL.Size = new System.Drawing.Size(37, 37);
+ this.lbRivetL.TabIndex = 9;
+ this.lbRivetL.Text = "0";
+ //
+ // label25
+ //
+ this.label25.AutoSize = true;
+ this.label25.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label25.ForeColor = System.Drawing.Color.White;
+ this.label25.Location = new System.Drawing.Point(35, 139);
+ this.label25.Name = "label25";
+ this.label25.Size = new System.Drawing.Size(171, 37);
+ this.label25.TabIndex = 8;
+ this.label25.Text = "铆钉(左)";
+ //
+ // lbScrewRAll
+ //
+ this.lbScrewRAll.AutoSize = true;
+ this.lbScrewRAll.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbScrewRAll.ForeColor = System.Drawing.Color.White;
+ this.lbScrewRAll.Location = new System.Drawing.Point(351, 70);
+ this.lbScrewRAll.Name = "lbScrewRAll";
+ this.lbScrewRAll.Size = new System.Drawing.Size(37, 37);
+ this.lbScrewRAll.TabIndex = 7;
+ this.lbScrewRAll.Text = "0";
+ //
+ // label15
+ //
+ this.label15.AutoSize = true;
+ this.label15.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label15.ForeColor = System.Drawing.Color.White;
+ this.label15.Location = new System.Drawing.Point(291, 70);
+ this.label15.Name = "label15";
+ this.label15.Size = new System.Drawing.Size(37, 37);
+ this.label15.TabIndex = 6;
+ this.label15.Text = "/";
+ //
+ // lbScrewR
+ //
+ this.lbScrewR.AutoSize = true;
+ this.lbScrewR.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbScrewR.ForeColor = System.Drawing.Color.White;
+ this.lbScrewR.Location = new System.Drawing.Point(235, 70);
+ this.lbScrewR.Name = "lbScrewR";
+ this.lbScrewR.Size = new System.Drawing.Size(37, 37);
+ this.lbScrewR.TabIndex = 5;
+ this.lbScrewR.Text = "0";
+ //
+ // label17
+ //
+ this.label17.AutoSize = true;
+ this.label17.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label17.ForeColor = System.Drawing.Color.White;
+ this.label17.Location = new System.Drawing.Point(35, 70);
+ this.label17.Name = "label17";
+ this.label17.Size = new System.Drawing.Size(171, 37);
+ this.label17.TabIndex = 4;
+ this.label17.Text = "螺钉(右)";
+ //
+ // lbScrewLAll
+ //
+ this.lbScrewLAll.AutoSize = true;
+ this.lbScrewLAll.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbScrewLAll.ForeColor = System.Drawing.Color.White;
+ this.lbScrewLAll.Location = new System.Drawing.Point(351, 17);
+ this.lbScrewLAll.Name = "lbScrewLAll";
+ this.lbScrewLAll.Size = new System.Drawing.Size(37, 37);
+ this.lbScrewLAll.TabIndex = 3;
+ this.lbScrewLAll.Text = "0";
+ //
+ // label8
+ //
+ this.label8.AutoSize = true;
+ this.label8.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label8.ForeColor = System.Drawing.Color.White;
+ this.label8.Location = new System.Drawing.Point(291, 17);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(37, 37);
+ this.label8.TabIndex = 2;
+ this.label8.Text = "/";
+ //
+ // lbScrewL
+ //
+ this.lbScrewL.AutoSize = true;
+ this.lbScrewL.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbScrewL.ForeColor = System.Drawing.Color.White;
+ this.lbScrewL.Location = new System.Drawing.Point(235, 17);
+ this.lbScrewL.Name = "lbScrewL";
+ this.lbScrewL.Size = new System.Drawing.Size(37, 37);
+ this.lbScrewL.TabIndex = 1;
+ this.lbScrewL.Text = "0";
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label2.ForeColor = System.Drawing.Color.White;
+ this.label2.Location = new System.Drawing.Point(35, 17);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(171, 37);
+ this.label2.TabIndex = 0;
+ this.label2.Text = "螺钉(左)";
+ //
+ // showHintTimer
+ //
+ this.showHintTimer.Interval = 2000;
+ this.showHintTimer.Tick += new System.EventHandler(this.showHintTimer_Tick);
+ //
+ // LoadScrewTimer
+ //
+ this.LoadScrewTimer.Enabled = true;
+ this.LoadScrewTimer.Interval = 1000;
+ this.LoadScrewTimer.Tick += new System.EventHandler(this.LoadScrewTimer_Tick);
//
- this.lbHint.AutoSize = true;
- this.lbHint.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lbHint.ForeColor = System.Drawing.Color.Red;
- this.lbHint.Location = new System.Drawing.Point(31, 339);
- this.lbHint.Name = "lbHint";
- this.lbHint.Size = new System.Drawing.Size(155, 34);
- this.lbHint.TabIndex = 29;
- this.lbHint.Text = "异常错误";
+ // txtBarCode
+ //
+ this.txtBarCode.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtBarCode.Location = new System.Drawing.Point(33, 143);
+ this.txtBarCode.Name = "txtBarCode";
+ this.txtBarCode.Size = new System.Drawing.Size(425, 53);
+ this.txtBarCode.TabIndex = 6;
+ this.txtBarCode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBarCode_KeyDown);
+ //
+ // txtBoxFocusTimer
+ //
+ this.txtBoxFocusTimer.Enabled = true;
+ this.txtBoxFocusTimer.Interval = 2000;
+ this.txtBoxFocusTimer.Tick += new System.EventHandler(this.txtBoxFocusTimer_Tick);
//
// FrmAssemble
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1948, 1346);
+ this.ClientSize = new System.Drawing.Size(2125, 1538);
this.Controls.Add(this.tableLayoutPanel1);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Name = "FrmAssemble";
this.Text = "FrmAssemble";
this.Load += new System.EventHandler(this.FrmAssemble_Load);
@@ -658,11 +1022,12 @@ namespace PunchingMistake
this.panel5.PerformLayout();
this.tableLayoutPanel4.ResumeLayout(false);
this.panel10.ResumeLayout(false);
- this.panel10.PerformLayout();
this.panel11.ResumeLayout(false);
this.panel11.PerformLayout();
this.panel14.ResumeLayout(false);
this.panel14.PerformLayout();
+ this.panel18.ResumeLayout(false);
+ this.panel18.PerformLayout();
this.ResumeLayout(false);
}
@@ -685,7 +1050,7 @@ namespace PunchingMistake
private System.Windows.Forms.Panel panel10;
private System.Windows.Forms.Button btnPlanDown;
private System.Windows.Forms.Button btnPlanUp;
- private System.Windows.Forms.Button button6;
+ private System.Windows.Forms.Button btnPlanSearch;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.Label label5;
@@ -695,7 +1060,6 @@ namespace PunchingMistake
private System.Windows.Forms.Label lbPartDesc;
private System.Windows.Forms.Label lbPart;
private System.Windows.Forms.Label lbPlan;
- private System.Windows.Forms.TextBox txtBarCode;
private System.Windows.Forms.Panel panel11;
private System.Windows.Forms.Label lbClass;
private System.Windows.Forms.Label label10;
@@ -708,9 +1072,39 @@ namespace PunchingMistake
private System.Windows.Forms.Label lbPlanQty;
private System.Windows.Forms.Label lbCompleteQty;
private System.Windows.Forms.Label lbBadQty;
- private System.Windows.Forms.Button button5;
+ private System.Windows.Forms.Button btnPlanFinish;
private System.Windows.Forms.Panel panel15;
private System.Windows.Forms.Panel panel16;
private System.Windows.Forms.Label lbHint;
+ private System.Windows.Forms.Panel panel17;
+ private System.Windows.Forms.Panel panel18;
+ private System.Windows.Forms.Label lbRivetRAll;
+ private System.Windows.Forms.Label label19;
+ private System.Windows.Forms.Label lbRivetR;
+ private System.Windows.Forms.Label label21;
+ private System.Windows.Forms.Label lbRivetLAll;
+ private System.Windows.Forms.Label label23;
+ private System.Windows.Forms.Label lbRivetL;
+ private System.Windows.Forms.Label label25;
+ private System.Windows.Forms.Label lbScrewRAll;
+ private System.Windows.Forms.Label label15;
+ private System.Windows.Forms.Label lbScrewR;
+ private System.Windows.Forms.Label label17;
+ private System.Windows.Forms.Label lbScrewLAll;
+ private System.Windows.Forms.Label label8;
+ private System.Windows.Forms.Label lbScrewL;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.Label lbIrlsAll;
+ private System.Windows.Forms.Label label27;
+ private System.Windows.Forms.Label lbIrls;
+ private System.Windows.Forms.Label label29;
+ private System.Windows.Forms.Label txtLinkState;
+ private System.Windows.Forms.Label label30;
+ private System.Windows.Forms.Label lbScanState;
+ private System.Windows.Forms.Label lbDisplay;
+ private System.Windows.Forms.Timer showHintTimer;
+ private System.Windows.Forms.Timer LoadScrewTimer;
+ private System.Windows.Forms.TextBox txtBarCode;
+ private System.Windows.Forms.Timer txtBoxFocusTimer;
}
}
\ No newline at end of file
diff --git a/PunchingMistake/FrmAssemble.cs b/PunchingMistake/FrmAssemble.cs
index 8f01818..d4432b0 100644
--- a/PunchingMistake/FrmAssemble.cs
+++ b/PunchingMistake/FrmAssemble.cs
@@ -23,12 +23,34 @@ namespace PunchingMistake
{
public partial class FrmAssemble : Form
{
+ private PlcInvoke _plcInvoke = null;
private GridppReport Report = new GridppReport();
private string oneBarCode = "", _stationNo = "", stationId = "";
private UniqueBll _uniqueBll = new UniqueBll();
+ private string _sjBarCode = string.Empty;
+ private string _partNo1 = string.Empty;
+ private string _partNo2 = string.Empty;
+ ///
+ /// 当前设备行数据ID
+ ///
+ private string _lineDataID = string.Empty;
public FrmAssemble()
{
InitializeComponent();
+ this.StartPosition = FormStartPosition.CenterScreen;
+ string plcRate = ConfigurationManager.AppSettings["刷新频率"] ;
+
+ int rate = 0;
+ int.TryParse(plcRate, out rate);
+ if (rate == 0)
+ {
+ rate = 200;
+ }
+
+ _plcInvoke = new PlcInvoke("BBMPT.Assemble", _stationNo);
+ _plcInvoke.ShowLinkInfo = ShowLinkResult;
+ _plcInvoke.ShowMessage = ShowMassege;
+ _plcInvoke.InitDev(rate);
}
private void FrmAssemble_Load(object sender, EventArgs e)
@@ -39,6 +61,8 @@ namespace PunchingMistake
Control.CheckForIllegalCrossThreadCalls = false;
Thread t = new Thread(new ThreadStart(TimeGo));
t.Start();
+
+
LoadScreen();
}
public void LoadScreen()
@@ -48,11 +72,34 @@ namespace PunchingMistake
{
SetPage(dt);
}
-
+ if(string.IsNullOrEmpty(_lineDataID))
+ {
+ if (this.Tag != null)
+ {
+ DataTable lineTable = Function2.GetPunchLineInfo(this.Tag.ToString(), _stationNo);
+ if (lineTable.Rows.Count > 0)
+ {
+ _lineDataID = lineTable.Rows[0]["ID"].ToString();
+ _sjBarCode = lineTable.Rows[0]["SjBarCode"].ToString();
+ _partNo1 = lineTable.Rows[0]["PartNo1"].ToString();
+ _partNo2 = lineTable.Rows[0]["PartNo2"].ToString();
+ ScanAll.barCode1 = lineTable.Rows[0]["barCode1"].ToString();
+ ScanAll.barCode2 = lineTable.Rows[0]["barCode2"].ToString();
+ ScanAll.barCode3 = lineTable.Rows[0]["barCode3"].ToString();
+ ScanAll.barCode4 = lineTable.Rows[0]["barCode4"].ToString();
+ ScanAll.barCode5 = lineTable.Rows[0]["barCode5"].ToString();
+ ScanAll.barCode6 = lineTable.Rows[0]["barCode6"].ToString();
+ _plcInvoke.SetLineID(_lineDataID);
+ }
+
+ }
+ }
+ LoadScrewTimer_Tick(null, null);
}
public void SetPage(DataTable dt)
{
ClearPage();
+
if (dt.Rows.Count > 0)
{
this.Tag = dt.Rows[0]["ID"].ToString();
@@ -71,7 +118,7 @@ namespace PunchingMistake
}
void ClearPage()
{
- lbStation.Text = "";
+ //lbStation.Text = "";
lbPlan.Text = "";
lbPart.Text = "";
lbPartDesc.Text = "";
@@ -79,6 +126,16 @@ namespace PunchingMistake
private void btnPlanUp_Click(object sender, EventArgs e)
{
+ if (!string.IsNullOrEmpty(_lineDataID))
+ {
+ DataTable lineTable = Function2.GetPunchLineInfo(_lineDataID);
+ if (lineTable.Rows.Count > 0)
+ {
+ MessageBox.Show("当前订单未完成,无法切换下一计划.");
+ return;
+ }
+ }
+
LoadPlanScreen(this.Tag?.ToString(), "上一计划");
txtBarCode.Select();
txtBarCode.Focus();
@@ -86,13 +143,22 @@ namespace PunchingMistake
private void btnPlanDown_Click(object sender, EventArgs e)
{
+ if (!string.IsNullOrEmpty(_lineDataID))
+ {
+ DataTable lineTable = Function2.GetPunchLineInfo(_lineDataID);
+ if(lineTable.Rows.Count>0)
+ {
+ MessageBox.Show("当前订单未完成,无法切换下一计划.");
+ return;
+ }
+ }
LoadPlanScreen(this.Tag?.ToString(), "下一计划");
+ ClearScanData(true);
txtBarCode.Select();
txtBarCode.Focus();
}
public void LoadPlanScreen(string id, string plan)
{
-
DataTable dt = Function2.GetProScreenPlan(id, _stationNo, plan);
if (dt != null && dt.Rows.Count > 0)
{
@@ -121,74 +187,279 @@ namespace PunchingMistake
{
try
{
- WriteHint("", true);
+ if (e.KeyCode != Keys.Enter)
+ {
+ return;
+ }
+ WriteHint("", true);
+ string barcode = txtBarCode.Text?.Trim();
+ if (string.IsNullOrEmpty(barcode))
+ {
+ throw new Exception("扫描条码为空!");
+ }
+
if (string.IsNullOrEmpty(this.Tag?.ToString()))
{
throw new Exception("当前没有生产计划.");
}
- ScanBarCode();
+ if (barcode == "88888888")
+ {
+ if (string.IsNullOrEmpty(_sjBarCode))
+ {
+ throw new Exception("请先扫描半成品塑件条码!");
+ }
+ else if (string.IsNullOrEmpty(_partNo1))
+ {
+ throw new Exception("总成零件号为空,无法保存!");
+ }
+ else if (string.IsNullOrEmpty(_partNo2))
+ {
+ throw new Exception("半成品零件号为空,无法保存!");
+ }
+ if(ScrewCompleteVerify() == false)
+ {
+ throw new Exception("螺钉铆钉未打够数量,无法保存!");
+ }
+
+
+ SaveScanRecord(_sjBarCode, _partNo1, _partNo2);
+ Function2. DeleteLineData(_lineDataID);
+ ClearScanData(true);
+ SentToPlc(true, _lineDataID);
+
+ ShowHint(true);
+ WriteHint("保存成功", true);
+ return;
+ }
+ else
+ {
+ _sjBarCode = txtBarCode.Text?.Trim();
+ ScanBarCode();
+ }
+
}
catch(Exception ex)
{
+ //ClearScanData(false);
+
+ ShowHint(false);
WriteHint(ex.Message,false);
}
+ //finally
+ //{
+ // txtBarCode.Focus();
+ // txtBarCode.SelectAll();
+ //}
}
+ void ClearScanData(bool isAllClear)
+ {
+ _sjBarCode = string.Empty;
+ _partNo1 = string.Empty;
+ _partNo2 = string.Empty;
+
+ ScanAll.barCode1 = string.Empty;
+ ScanAll.barCode2 = string.Empty;
+ ScanAll.barCode3 = string.Empty;
+ ScanAll.barCode4 = string.Empty;
+ ScanAll.barCode5 = string.Empty;
+ ScanAll.barCode6 = string.Empty;
+
+ if(isAllClear == true)
+ {
+ lbScrewL.Text = "0";
+ lbScrewR.Text = "0";
+ lbScrewLAll.Text = "0";
+ lbScrewRAll.Text = "0";
+
+ lbRivetL.Text = "0";
+ lbRivetR.Text = "0";
+ lbRivetLAll.Text = "0";
+ lbRivetRAll.Text = "0";
+
+ lbIrls.Text = "0";
+ lbIrlsAll.Text = "0";
+
+ }
+ }
+
private void ScanBarCode()
{
- string barCode = txtBarCode.Text?.Trim();
- if (string.IsNullOrEmpty(barCode))
+
+ bool verifyPreProcess = Function2.GetVerifyPreProcess();
+ if(verifyPreProcess == true)
{
- throw new Exception("扫描条码为空!");
+ bool isPass = Function2.GetInspectResultCheck(_sjBarCode);
+ if(isPass == false)
+ {
+ throw new Exception($"扫描条码[{_sjBarCode}],未通过上线前质检工序,无法使用.");
+ }
+ }
+
+ DataTable productTable = PartScanVerify();
+
+ _partNo2 = productTable.Rows[0]["PartNo"].ToString();
+ _partNo1 = Function2.GetAssemblePartCode(_partNo2, _stationNo);
+
+ if (lbPart.Text?.ToLower() != _partNo1?.ToLower())
+ {
+ throw new Exception($"扫描半成品码在BOM中对应的总成零件号[{_partNo1}]与当前计划的零件号[{lbPart.Text}]不匹配.");
+
}
- if (barCode.Length != 20)
+ DataTable bomTable = Function2.GetBomTable(_partNo1, _stationNo);
+
+ //需要校验的关键件
+ List list = bomTable.AsEnumerable().Where(p => p.Field("IsChecked") == true).ToList();
+ //螺钉铆钉数量BOM集合
+ List list2 = bomTable.AsEnumerable().Where(p => p.Field("PartDesc2").Contains("螺钉") || p.Field("PartDesc2").Contains("铆钉") || p.Field("PartDesc2").Contains("虹膜")).ToList();
+ if (list.Count > 0)
+ {
+ //需要校验关键件
+ FrmProScreen3 frm = new FrmProScreen3(list);
+ frm.ScanCompleted += (rst) =>
+ {
+ if(rst == false)
+ {
+ ClearScanData(true);
+ WriteHint("扫描关键件已取消", false);
+ return;
+ }
+ if (list2.Count > 0)
+ {
+ //接收到螺钉信号后再保存
+ SendScrewRivet(bomTable, list2, _sjBarCode);
+ }
+ else
+ {
+ _lineDataID = Function2.SaveLineInfo(_sjBarCode, this.Tag?.ToString(), _stationNo, _partNo1, _partNo2, 0, 0, 0, 0, 0);
+
+ WriteHint("验证成功,请扫完成码保存", true);
+ //SaveScanRecord(barCode, partNo1, partNo2);
+ }
+ };
+ frm.ShowDialog();
+ }
+ else
+ {
+ if (list2.Count > 0)
+ {
+ //接收到螺钉信号后再保存
+ SendScrewRivet(bomTable, list2, _sjBarCode);
+ }
+ else
+ {
+ _lineDataID = Function2.SaveLineInfo(_sjBarCode, this.Tag?.ToString(), _stationNo, _partNo1, _partNo2, 0, 0, 0, 0, 0);
+ WriteHint("验证成功,请扫完成码保存", true);
+ //SaveScanRecord(barCode, partNo1, partNo2);
+ }
+ }
+ }
+
+ ///
+ /// 扫描半成品的校验
+ ///
+ ///
+ DataTable PartScanVerify()
+ {
+ if (_sjBarCode.Length != 20)
{
throw new Exception("扫描条码格式不正确,请扫描20位塑件条码!");
}
- DataTable stockInTable = Function2.SearchStockIn(barCode);
+ DataTable stockInTable = Function2.SearchStockIn(_sjBarCode);
if (stockInTable.Rows.Count == 0)
{
throw new Exception("扫描半成品码没有喷涂完工记录,无法使用.");
}
- DataTable punchTable = Function2.SearchPunchCodeRecord(barCode);
+ DataTable punchTable = Function2.SearchPunchCodeRecord(_sjBarCode);
if (punchTable.Rows.Count > 0)
{
if (punchTable.Rows[0]["Flag"].ToString() == "0" || punchTable.Rows[0]["Flag"].ToString() == "1")
- {
+ {
throw new Exception("扫描半成品码已存在装配记录,无法使用.");
}
}
- DataTable productTable = Function2.GetProductInfo(barCode.Substring(0, 10));
+ DataTable productTable = Function2.GetProductInfo(_sjBarCode.Substring(0, 10));
if (productTable.Rows.Count == 0)
{
- throw new Exception($"扫描半成品码的存货代码[{barCode.Substring(0, 10)}]在零件表找不对对应零件号,请检查系统维护.");
+ throw new Exception($"扫描半成品码的存货代码[{_sjBarCode.Substring(0, 10)}]在零件表找不对对应零件号,请检查系统维护.");
}
- string partNo2 = productTable.Rows[0]["PartNo"].ToString();
- string partNo1 = Function2.GetAssemblePartCode(partNo2, _stationNo);
-
- if (lbPart.Text?.ToLower() != partNo1?.ToLower())
- {
- throw new Exception($"扫描半成品码在BOM中对应的总成零件号[{partNo1}]与当前计划的零件号[{lbPart.Text}]不匹配.");
-
- }
- DataTable bomTable = Function2.GetBomTable(partNo1, _stationNo);
+ return productTable;
+ }
+ bool ScrewCompleteVerify()
+ {
+ int screwL = 0, screwR = 0, rivetL = 0, rivetR = 0, irls = 0;
+ int screwLAll = 0, screwRAll = 0, rivetLAll = 0, rivetRAll = 0, irlsAll = 0;
- List list = bomTable.AsEnumerable().Where(p => p.Field("IsChecked") == 1).ToList();
- if (list.Count > 0)
- {
- //需要校验关键件
+ int.TryParse(lbScrewL.Text, out screwL);
+ int.TryParse(lbScrewR.Text, out screwR);
+ int.TryParse(lbRivetL.Text, out rivetL);
+ int.TryParse(lbRivetR.Text, out rivetR);
+ int.TryParse(lbIrls.Text, out irls);
+ int.TryParse(lbScrewLAll.Text, out screwLAll);
+ int.TryParse(lbScrewRAll.Text, out screwRAll);
+ int.TryParse(lbRivetLAll.Text, out rivetLAll);
+ int.TryParse(lbRivetRAll.Text, out rivetRAll);
+ int.TryParse(lbIrlsAll.Text, out irlsAll);
+ if (screwL < screwLAll)
+ return false;
+ if (screwR < screwRAll)
+ return false;
+ if (rivetL < rivetLAll)
+ return false;
+ if (rivetR < rivetRAll)
+ return false;
+ if (irls < irlsAll)
+ return false;
+ return true;
+ }
- }
- else
+ void SendScrewRivet(DataTable bomTable, List list2 ,string barCode)
+ {
+ if (list2.Count > 0)
{
- SaveScanRecord(barCode,partNo1, partNo2);
- }
-
-
+ string sjBarCode = barCode;
+ //螺钉数量
+ int leftQty1 = 0;
+ int rightQty1 = 0;
+ //铆钉数量
+ int leftQty2 = 0;
+ int rightQty2 = 0;
+ //虹膜
+ int leftQty3 = 0;
+ foreach (DataRow dr in list2)
+ {
+ string desc = dr["PartDesc2"].ToString();
+ if (desc.Contains("螺钉"))
+ {
+ leftQty1 = int.Parse(dr["LeftCount"].ToString());
+ rightQty1 = int.Parse(dr["RightCount"].ToString());
+ lbScrewLAll.Text = leftQty1.ToString();
+ lbScrewRAll.Text = rightQty1.ToString();
+ }
+ if (desc.Contains("铆钉"))
+ {
+ leftQty2 = int.Parse(dr["LeftCount"].ToString());
+ rightQty2 = int.Parse(dr["RightCount"].ToString());
+ lbRivetLAll.Text = leftQty2.ToString();
+ lbRivetRAll.Text = rightQty2.ToString();
+ }
+ if (desc.Contains("虹膜"))
+ {
+ leftQty3 = int.Parse(dr["LeftCount"].ToString());
+ lbIrlsAll.Text = leftQty3.ToString();
+ }
+ }
+ _lineDataID = Function2.SaveLineInfo(sjBarCode, this.Tag?.ToString(),_stationNo,_partNo1,_partNo2, leftQty2, rightQty2, leftQty1, rightQty1, leftQty3);
+ SentToPlc(false,_lineDataID);
+ }
+ }
+ private void SentToPlc(bool isInit, string lineID)
+ {
+ _plcInvoke.SendToPLC(isInit, lineID);
}
private void SaveScanRecord(string barcode,string partNo1,string partNo2)
@@ -198,10 +469,10 @@ namespace PunchingMistake
//
string serailNo = "0001";
string assembleBarCode = _uniqueBll.GetPunchSerialNo(partNo1, 4,ref serailNo);
- int res = Function2.SavePartAndProduct_New(barcode, partNo2, partNo1,
- lbPlan.Text.Trim(), lbClass.Text, this.Tag?.ToString(), assembleBarCode,
+ int res = Function2.SavePartAndProduct_New(barcode, partNo1, partNo2, assembleBarCode,
+ lbPlan.Text.Trim(), lbClass.Text, this.Tag?.ToString(), serailNo,
ScanAll.barCode1, ScanAll.barCode2, ScanAll.barCode3,
- ScanAll.barCode4, ScanAll.barCode5, ScanAll.barCode6, stationId, ConfigurationManager.AppSettings["StationDescription"]);
+ ScanAll.barCode4, ScanAll.barCode5, ScanAll.barCode6, _stationNo, ConfigurationManager.AppSettings["StationDescription"]);
Function2.SaveZcCode(barcode, partNo1);
Function2.AddCompleteCount(this.Tag?.ToString());
@@ -220,92 +491,199 @@ namespace PunchingMistake
}
private void PrintAssembleBarCode(string BarCode, string PartNo, string PartName, string SerialNo )
{
- string filename = GetPrintFileName();
- DataTable headTable = new DataTable();
- headTable.Columns.Add("BarCode");
- headTable.Columns.Add("PartName");
- headTable.Columns.Add("PartNo");
- headTable.Columns.Add("BatchNo");
- headTable.Columns.Add("SerialNo");
- headTable.Columns.Add("Line");
- DataRow row = headTable.NewRow();
+ Printer.PrintPunchAssembleBarCode(BarCode, PartNo, PartName, SerialNo);
- row["BarCode"] = BarCode;
- row["PartNo"] = PartNo;
- row["PartName"] = PartName;
- row["BatchNo"] = DateTime.Now.ToString("yyMMdd");
- row["SerialNo"] = SerialNo;
- row["Line"] = ConfigurationManager.AppSettings["Line"];
- string printBoxName = "Printer1";
-
- string reportName = ConfigurationManager.AppSettings[printBoxName].ToString();
- headTable.Rows.Add(row);
-
- ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoLandscape, 1, reportName);
-
- rp.Report.Print(false);
}
- string GetPrintFileName()
+
+
+ void WriteHint(string txt,bool isOk)
+ {
+ lbHint.ForeColor = Color.LimeGreen;
+ if (!isOk)
+ {
+ lbHint.ForeColor = Color.Red;
+ }
+ lbHint.Text = txt;
+ }
+
+ private void label10_DoubleClick(object sender, EventArgs e)
+ {
+ this.Close();
+ }
+
+ private void TimeGo()
+ {
+ System.Timers.Timer timer = new System.Timers.Timer();
+ timer.Interval = 10;
+ timer.Enabled = true;
+ timer.Elapsed += new System.Timers.ElapsedEventHandler(timer_Tick);
+ }
+
+ private void timer_Tick(object sender, EventArgs e)
{
- if(Program.station == "F01")
+ try
{
- return System.AppDomain.CurrentDomain.BaseDirectory + "/Report/总成条码MI.grf";
+ lbPartDesc.Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ Thread.Sleep(500);
}
+ catch (Exception ex)
+ {
- return System.AppDomain.CurrentDomain.BaseDirectory + "/Report/总成条码MI.grf";
+ }
}
- string GetSerialNo(string partNo1)
+ void ShowLinkResult(bool isSuccess, bool isWriteLog)
{
- DateTime time = DateTime.Now;
- string tmp = Function2.SerialNo(partNo1, time.ToString("yyMMdd"));
- string sn = "";
- if (tmp == "")
+ if (isSuccess)
{
- sn = GetFullBarCode(partNo1, "0001");
+ txtLinkState.Text = "连接成功";
+ if (isWriteLog)
+ WriteLog("连接成功");
+ txtLinkState.BackColor = Color.Green;
+ // ShowScanResult(false);
}
else
{
- sn = tmp.Substring(0, tmp.Length - 4) +
- (int.Parse(tmp.Substring(tmp.Length - 4, 4)) + 1).ToString()
- .PadLeft(4, '0');
+ txtLinkState.Text = "连接失败";
+ if (isWriteLog)
+ WriteLog("连接失败");
+ txtLinkState.BackColor = Color.Red;
+ //ShowScanResult(false);
}
- return sn;
}
- string GetFullBarCode(string partNo,string serialNo)
+
+ private void btnPlanSearch_Click(object sender, EventArgs e)
{
- DateTime time = DateTime.Now;
- return partNo + "." + time.ToString("yyMMdd") + ";" + serialNo + ";S104;;.1;" + time.ToString("yyyy/MM/dd") + ";";
+ FrmPlanSeach frm = new FrmPlanSeach(this.Tag.ToString());
+ frm.ShowDialog();
}
- void WriteHint(string txt,bool isOk)
+ private void btnPlanFinish_Click(object sender, EventArgs e)
{
- lbHint.ForeColor = Color.LimeGreen;
- if (!isOk)
+ if (MessageBox.Show("计划结束后将不能再进行切换生产,确认将当前计划设置为结束状态?", "确认", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
+ return;
+ string planID = this.Tag?.ToString();
+ if (string.IsNullOrEmpty(planID))
{
- lbHint.ForeColor = Color.Red;
+ MessageBox.Show("计划信息错误,当前没有正在执行的计划.");
+ return;
+ }
+ else
+ {
+ if (!string.IsNullOrEmpty(_lineDataID))
+ {
+ DataTable lineTable = Function2.GetPunchLineInfo(_lineDataID);
+ if (lineTable.Rows.Count > 0)
+ {
+ MessageBox.Show("当前订单未完成,无法结束当前计划.");
+ return;
+ }
+ }
+
+ Function2.UpdatePlanState("3", planID);
+ ClearPage();
+ ClearScanData(true);
+ MessageBox.Show("设置成功");
+ LoadScreen();
}
- lbHint.Text = txt;
}
- private void TimeGo()
+
+ private void showHintTimer_Tick(object sender, EventArgs e)
{
- System.Timers.Timer timer = new System.Timers.Timer();
- timer.Interval = 10;
- timer.Enabled = true;
- timer.Elapsed += new System.Timers.ElapsedEventHandler(timer_Tick);
+ showHintTimer.Enabled = false;
+ lbDisplay.Visible = false;
}
- private void timer_Tick(object sender, EventArgs e)
+ ///
+ /// 螺钉铆钉刷新
+ ///
+ ///
+ ///
+ private void LoadScrewTimer_Tick(object sender, EventArgs e)
+ {
+ if (!string.IsNullOrEmpty(_lineDataID))
+ {
+ DataTable dt = Function2.GetPunchLineInfo(_lineDataID);
+ if (dt.Rows.Count > 0)
+ {
+ DataRow dr = dt.Rows[0];
+ lbScrewL.Text = dr["LeftScrew1"].ToString();
+ lbScrewR.Text = dr["RightScrew1"].ToString();
+ lbRivetL.Text = dr["LeftRivet1"].ToString();
+ lbRivetR.Text = dr["RightRivet1"].ToString();
+ lbIrls.Text = dr["IrIs"].ToString();
+
+ lbScrewLAll.Text = dr["LeftScrew1All"].ToString();
+ lbScrewRAll.Text = dr["RightScrew1All"].ToString();
+ lbRivetLAll.Text = dr["LeftRivet1All"].ToString();
+ lbRivetRAll.Text = dr["RightRivet1All"].ToString();
+ lbIrlsAll.Text = dr["IrIsAll"].ToString();
+ }
+ }
+ }
+
+ void ShowMassege(string txt, bool isOK)
+ {
+ if (isOK)
+ {
+ lbScanState.ForeColor = Color.Green;
+ }
+ else
+ {
+ lbScanState.ForeColor = Color.Red;
+ }
+ lbScanState.Text = txt;
+ }
+ public void WriteLog(string log)
{
try
{
- lbPartDesc.Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
- Thread.Sleep(500);
+ //this.lstState.Invoke(onMessage, log);
}
- catch (Exception ex)
+ catch { }
+ }
+
+ private void txtBoxFocusTimer_Tick(object sender, EventArgs e)
+ {
+ lbClass.Text = Function3.GetWorkClass();
+
+ txtBarCode.Focus();
+ txtBarCode.SelectAll();
+ }
+
+ ///
+ /// 显示OK和NG 以及提示音
+ ///
+ ///
+ private void ShowHint(bool isOk)
+ {
+ if (isOk)
+ {
+ lbDisplay.Text = "OK";
+ lbDisplay.ForeColor = Color.Lime;
+
+ }
+ else
{
+ lbDisplay.Text = "NG";
+ lbDisplay.ForeColor = Color.Red;
+ }
+ Play(isOk);
+ lbDisplay.Visible = true;
+ showHintTimer.Enabled = true;
+ }
+ void Play(bool isOK)
+ {
+ if (isOK)
+ {
+ PlaySound.PlaySounds.Play(AppDomain.CurrentDomain.BaseDirectory + "Images\\正确.wav");
}
+ else
+ {
+ PlaySound.PlaySounds.Play(AppDomain.CurrentDomain.BaseDirectory + "Images\\错误.wav");
+ }
}
+
}
}
diff --git a/PunchingMistake/FrmAssemble.resx b/PunchingMistake/FrmAssemble.resx
index e335a71..5fc47dd 100644
--- a/PunchingMistake/FrmAssemble.resx
+++ b/PunchingMistake/FrmAssemble.resx
@@ -1036,4 +1036,13 @@
gg==
+
+ 17, 17
+
+
+ 268, 17
+
+
+ 534, 17
+
\ No newline at end of file
diff --git a/PunchingMistake/FrmLogin.Designer.cs b/PunchingMistake/FrmLogin.Designer.cs
index e29579a..42f4c2a 100644
--- a/PunchingMistake/FrmLogin.Designer.cs
+++ b/PunchingMistake/FrmLogin.Designer.cs
@@ -45,10 +45,10 @@
this.label1.AutoSize = true;
this.label1.BackColor = System.Drawing.Color.White;
this.label1.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label1.Location = new System.Drawing.Point(396, 340);
- this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label1.Location = new System.Drawing.Point(432, 389);
+ this.label1.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(117, 34);
+ this.label1.Size = new System.Drawing.Size(131, 38);
this.label1.TabIndex = 0;
this.label1.Text = "用户名";
//
@@ -57,31 +57,31 @@
this.label2.AutoSize = true;
this.label2.BackColor = System.Drawing.Color.White;
this.label2.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label2.Location = new System.Drawing.Point(396, 432);
- this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label2.Location = new System.Drawing.Point(432, 494);
+ this.label2.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(83, 34);
+ this.label2.Size = new System.Drawing.Size(93, 38);
this.label2.TabIndex = 1;
this.label2.Text = "密码";
//
// textBox1
//
this.textBox1.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox1.Location = new System.Drawing.Point(543, 324);
- this.textBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.textBox1.Location = new System.Drawing.Point(592, 370);
+ this.textBox1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(288, 45);
+ this.textBox1.Size = new System.Drawing.Size(314, 51);
this.textBox1.TabIndex = 2;
this.textBox1.Click += new System.EventHandler(this.textBox1_Click);
//
// textBox2
//
this.textBox2.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox2.Location = new System.Drawing.Point(543, 432);
- this.textBox2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.textBox2.Location = new System.Drawing.Point(592, 494);
+ this.textBox2.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.textBox2.Name = "textBox2";
this.textBox2.PasswordChar = '*';
- this.textBox2.Size = new System.Drawing.Size(288, 45);
+ this.textBox2.Size = new System.Drawing.Size(314, 51);
this.textBox2.TabIndex = 3;
this.textBox2.Click += new System.EventHandler(this.textBox2_Click);
//
@@ -89,10 +89,10 @@
//
this.button1.BackColor = System.Drawing.Color.LightSkyBlue;
this.button1.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button1.Location = new System.Drawing.Point(424, 536);
- this.button1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.button1.Location = new System.Drawing.Point(463, 613);
+ this.button1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(154, 66);
+ this.button1.Size = new System.Drawing.Size(168, 75);
this.button1.TabIndex = 4;
this.button1.Text = "登录";
this.button1.UseVisualStyleBackColor = false;
@@ -102,10 +102,10 @@
//
this.button2.BackColor = System.Drawing.Color.LightSkyBlue;
this.button2.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button2.Location = new System.Drawing.Point(710, 536);
- this.button2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.button2.Location = new System.Drawing.Point(775, 613);
+ this.button2.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(152, 66);
+ this.button2.Size = new System.Drawing.Size(166, 75);
this.button2.TabIndex = 5;
this.button2.Text = "取消";
this.button2.UseVisualStyleBackColor = false;
@@ -116,10 +116,10 @@
this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
this.pictureBox1.Location = new System.Drawing.Point(0, 0);
- this.pictureBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.pictureBox1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(1289, 793);
- this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.pictureBox1.Size = new System.Drawing.Size(1348, 905);
+ this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox1.TabIndex = 6;
this.pictureBox1.TabStop = false;
//
@@ -129,17 +129,17 @@
this.lbtip.BackColor = System.Drawing.Color.White;
this.lbtip.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lbtip.ForeColor = System.Drawing.Color.Red;
- this.lbtip.Location = new System.Drawing.Point(387, 494);
+ this.lbtip.Location = new System.Drawing.Point(422, 565);
this.lbtip.Name = "lbtip";
- this.lbtip.Size = new System.Drawing.Size(58, 21);
+ this.lbtip.Size = new System.Drawing.Size(62, 24);
this.lbtip.TabIndex = 7;
this.lbtip.Text = " ";
//
// FrmLogin
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1289, 793);
+ this.ClientSize = new System.Drawing.Size(1348, 905);
this.Controls.Add(this.lbtip);
this.Controls.Add(this.label2);
this.Controls.Add(this.textBox1);
@@ -148,7 +148,8 @@
this.Controls.Add(this.button2);
this.Controls.Add(this.label1);
this.Controls.Add(this.pictureBox1);
- this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+ this.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.Name = "FrmLogin";
this.Text = "登录";
this.Load += new System.EventHandler(this.FrmLogin_Load);
diff --git a/PunchingMistake/FrmPlanSeach.Designer.cs b/PunchingMistake/FrmPlanSeach.Designer.cs
new file mode 100644
index 0000000..c39e8c3
--- /dev/null
+++ b/PunchingMistake/FrmPlanSeach.Designer.cs
@@ -0,0 +1,270 @@
+
+namespace PunchingMistake
+{
+ partial class FrmPlanSeach
+ {
+ ///
+ /// 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.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.btnRePrint = new System.Windows.Forms.Button();
+ this.txtBarCode = new System.Windows.Forms.TextBox();
+ this.label2 = new System.Windows.Forms.Label();
+ this.label3 = new System.Windows.Forms.Label();
+ this.date1 = new System.Windows.Forms.DateTimePicker();
+ this.date2 = new System.Windows.Forms.DateTimePicker();
+ this.btnSearch = new System.Windows.Forms.Button();
+ this.dataGridView1 = new System.Windows.Forms.DataGridView();
+ this.塑件条码 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.半成品零件号 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.总成条码 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.工位 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.计划编号 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.班组 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.质量状态 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.tableLayoutPanel1.SuspendLayout();
+ this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
+ this.SuspendLayout();
+ //
+ // tableLayoutPanel1
+ //
+ this.tableLayoutPanel1.ColumnCount = 1;
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+ this.tableLayoutPanel1.Controls.Add(this.panel1, 0, 0);
+ this.tableLayoutPanel1.Controls.Add(this.dataGridView1, 0, 1);
+ this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
+ this.tableLayoutPanel1.Name = "tableLayoutPanel1";
+ this.tableLayoutPanel1.RowCount = 3;
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 50F));
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F));
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(1807, 983);
+ this.tableLayoutPanel1.TabIndex = 0;
+ //
+ // panel1
+ //
+ this.panel1.Controls.Add(this.btnSearch);
+ this.panel1.Controls.Add(this.date2);
+ this.panel1.Controls.Add(this.date1);
+ this.panel1.Controls.Add(this.label3);
+ this.panel1.Controls.Add(this.txtBarCode);
+ this.panel1.Controls.Add(this.label2);
+ this.panel1.Controls.Add(this.btnRePrint);
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.panel1.Location = new System.Drawing.Point(3, 3);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(1801, 44);
+ this.panel1.TabIndex = 0;
+ //
+ // btnRePrint
+ //
+ this.btnRePrint.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)));
+ this.btnRePrint.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnRePrint.Location = new System.Drawing.Point(3, -3);
+ this.btnRePrint.Name = "btnRePrint";
+ this.btnRePrint.Size = new System.Drawing.Size(137, 55);
+ this.btnRePrint.TabIndex = 0;
+ this.btnRePrint.Text = "补 打";
+ this.btnRePrint.UseVisualStyleBackColor = true;
+ this.btnRePrint.Click += new System.EventHandler(this.btnRePrint_Click);
+ //
+ // txtBarCode
+ //
+ this.txtBarCode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.txtBarCode.Location = new System.Drawing.Point(989, 2);
+ this.txtBarCode.Name = "txtBarCode";
+ this.txtBarCode.Size = new System.Drawing.Size(200, 35);
+ this.txtBarCode.TabIndex = 4;
+ //
+ // label2
+ //
+ this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(925, 8);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(58, 24);
+ this.label2.TabIndex = 3;
+ this.label2.Text = "条码";
+ //
+ // label3
+ //
+ this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(1200, 7);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(58, 24);
+ this.label3.TabIndex = 5;
+ this.label3.Text = "时间";
+ //
+ // date1
+ //
+ this.date1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.date1.Location = new System.Drawing.Point(1259, 4);
+ this.date1.Name = "date1";
+ this.date1.Size = new System.Drawing.Size(200, 35);
+ this.date1.TabIndex = 6;
+ //
+ // date2
+ //
+ this.date2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.date2.Location = new System.Drawing.Point(1465, 4);
+ this.date2.Name = "date2";
+ this.date2.Size = new System.Drawing.Size(200, 35);
+ this.date2.TabIndex = 7;
+ //
+ // btnSearch
+ //
+ this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnSearch.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnSearch.Location = new System.Drawing.Point(1667, -3);
+ this.btnSearch.Name = "btnSearch";
+ this.btnSearch.Size = new System.Drawing.Size(137, 47);
+ this.btnSearch.TabIndex = 8;
+ this.btnSearch.Text = "查询";
+ this.btnSearch.UseVisualStyleBackColor = true;
+ this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
+ //
+ // dataGridView1
+ //
+ this.dataGridView1.AllowUserToAddRows = false;
+ this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+ this.塑件条码,
+ this.半成品零件号,
+ this.总成条码,
+ this.工位,
+ this.计划编号,
+ this.班组,
+ this.质量状态});
+ this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.dataGridView1.Location = new System.Drawing.Point(3, 53);
+ this.dataGridView1.Name = "dataGridView1";
+ this.dataGridView1.ReadOnly = true;
+ this.dataGridView1.RowHeadersWidth = 10;
+ this.dataGridView1.RowTemplate.Height = 37;
+ this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+ this.dataGridView1.Size = new System.Drawing.Size(1801, 887);
+ this.dataGridView1.TabIndex = 1;
+ //
+ // 塑件条码
+ //
+ this.塑件条码.DataPropertyName = "barcode";
+ this.塑件条码.HeaderText = "塑件条码";
+ this.塑件条码.MinimumWidth = 10;
+ this.塑件条码.Name = "塑件条码";
+ this.塑件条码.ReadOnly = true;
+ //
+ // 半成品零件号
+ //
+ this.半成品零件号.DataPropertyName = "BcpID";
+ this.半成品零件号.HeaderText = "半成品零件号";
+ this.半成品零件号.MinimumWidth = 10;
+ this.半成品零件号.Name = "半成品零件号";
+ this.半成品零件号.ReadOnly = true;
+ //
+ // 总成条码
+ //
+ this.总成条码.DataPropertyName = "ZcBarCode";
+ this.总成条码.HeaderText = "总成条码";
+ this.总成条码.MinimumWidth = 10;
+ this.总成条码.Name = "总成条码";
+ this.总成条码.ReadOnly = true;
+ this.总成条码.Width = 200;
+ //
+ // 工位
+ //
+ this.工位.DataPropertyName = "StationNo";
+ this.工位.HeaderText = "工位";
+ this.工位.MinimumWidth = 10;
+ this.工位.Name = "工位";
+ this.工位.ReadOnly = true;
+ //
+ // 计划编号
+ //
+ this.计划编号.DataPropertyName = "OrderNo";
+ this.计划编号.HeaderText = "计划编号";
+ this.计划编号.MinimumWidth = 10;
+ this.计划编号.Name = "计划编号";
+ this.计划编号.ReadOnly = true;
+ //
+ // 班组
+ //
+ this.班组.DataPropertyName = "WorkClass";
+ this.班组.HeaderText = "班组";
+ this.班组.MinimumWidth = 10;
+ this.班组.Name = "班组";
+ this.班组.ReadOnly = true;
+ //
+ // 质量状态
+ //
+ this.质量状态.DataPropertyName = "Flag";
+ this.质量状态.HeaderText = "质量状态";
+ this.质量状态.MinimumWidth = 10;
+ this.质量状态.Name = "质量状态";
+ this.质量状态.ReadOnly = true;
+ //
+ // FrmPlanSeach
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1807, 983);
+ this.Controls.Add(this.tableLayoutPanel1);
+ this.Name = "FrmPlanSeach";
+ this.Text = "计划数据查询补打";
+ this.tableLayoutPanel1.ResumeLayout(false);
+ this.panel1.ResumeLayout(false);
+ this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
+ private System.Windows.Forms.Panel panel1;
+ private System.Windows.Forms.Button btnRePrint;
+ private System.Windows.Forms.TextBox txtBarCode;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.Button btnSearch;
+ private System.Windows.Forms.DateTimePicker date2;
+ private System.Windows.Forms.DateTimePicker date1;
+ private System.Windows.Forms.DataGridView dataGridView1;
+ private System.Windows.Forms.DataGridViewTextBoxColumn 塑件条码;
+ private System.Windows.Forms.DataGridViewTextBoxColumn 半成品零件号;
+ private System.Windows.Forms.DataGridViewTextBoxColumn 总成条码;
+ private System.Windows.Forms.DataGridViewTextBoxColumn 工位;
+ private System.Windows.Forms.DataGridViewTextBoxColumn 计划编号;
+ private System.Windows.Forms.DataGridViewTextBoxColumn 班组;
+ private System.Windows.Forms.DataGridViewTextBoxColumn 质量状态;
+ }
+}
\ No newline at end of file
diff --git a/PunchingMistake/FrmPlanSeach.cs b/PunchingMistake/FrmPlanSeach.cs
new file mode 100644
index 0000000..e4f4afc
--- /dev/null
+++ b/PunchingMistake/FrmPlanSeach.cs
@@ -0,0 +1,54 @@
+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 PunchingMistake
+{
+ public partial class FrmPlanSeach : Form
+ {
+ private string _planID = string.Empty;
+
+ public FrmPlanSeach(string planID)
+ {
+ InitializeComponent();
+ dataGridView1.AutoGenerateColumns = false;
+ this.StartPosition = FormStartPosition.CenterParent;
+ _planID = planID;
+ date1.Value = DateTime.Now.AddDays(-1);
+ btnSearch_Click(null, null);
+ }
+
+ private void btnSearch_Click(object sender, EventArgs e)
+ {
+ string d1 = date1.Value.ToString("yyyy-MM-dd 00:00:00:000");
+ string d2 = date2.Value.ToString("yyyy-MM-dd 23:59:59:000");
+
+ DataTable dt = Function2.GetPunchRecord(_planID, txtBarCode.Text, d1, d2);
+ dataGridView1.DataSource = dt;
+ }
+
+ private void btnRePrint_Click(object sender, EventArgs e)
+ {
+ if( dataGridView1.SelectedRows.Count == 0)
+ {
+ MessageBox.Show("请先选择数据.");
+ return;
+ }
+ DataRow row = (dataGridView1.SelectedRows[0].DataBoundItem as DataRowView).Row;
+ string partName = Function2.GetProductName(row["ZcPartNo"].ToString());
+ if (string.IsNullOrEmpty(partName))
+ {
+ MessageBox.Show($"总成零件号[{row["ZcPartNo"].ToString()}]在零件表中不存在.");
+ return;
+ }
+ Printer.PrintPunchAssembleBarCode(row["ZcBarCode"].ToString(), row["ZcPartNo"].ToString(), partName, row["SerialNo"].ToString());
+
+ }
+ }
+}
diff --git a/PunchingMistake/FrmPlanSeach.resx b/PunchingMistake/FrmPlanSeach.resx
new file mode 100644
index 0000000..6870264
--- /dev/null
+++ b/PunchingMistake/FrmPlanSeach.resx
@@ -0,0 +1,162 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
\ No newline at end of file
diff --git a/PunchingMistake/FrmProScreen3.Designer.cs b/PunchingMistake/FrmProScreen3.Designer.cs
index b70d7fb..53f4554 100644
--- a/PunchingMistake/FrmProScreen3.Designer.cs
+++ b/PunchingMistake/FrmProScreen3.Designer.cs
@@ -52,54 +52,60 @@
// label1
//
this.label1.Font = new System.Drawing.Font("微软雅黑", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label1.Location = new System.Drawing.Point(12, 43);
+ this.label1.Location = new System.Drawing.Point(24, 86);
+ this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(180, 40);
+ this.label1.Size = new System.Drawing.Size(360, 80);
this.label1.TabIndex = 0;
this.label1.Text = "关键零件号1:";
//
// textBox1
//
this.textBox1.Font = new System.Drawing.Font("微软雅黑", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox1.Location = new System.Drawing.Point(403, 40);
+ this.textBox1.Location = new System.Drawing.Point(806, 80);
+ this.textBox1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(486, 43);
+ this.textBox1.Size = new System.Drawing.Size(968, 78);
this.textBox1.TabIndex = 1;
this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown);
//
// textBox2
//
this.textBox2.Font = new System.Drawing.Font("微软雅黑", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox2.Location = new System.Drawing.Point(403, 111);
+ this.textBox2.Location = new System.Drawing.Point(806, 222);
+ this.textBox2.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(486, 43);
+ this.textBox2.Size = new System.Drawing.Size(968, 78);
this.textBox2.TabIndex = 3;
this.textBox2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox2_KeyDown);
//
// label2
//
this.label2.Font = new System.Drawing.Font("微软雅黑", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label2.Location = new System.Drawing.Point(12, 114);
+ this.label2.Location = new System.Drawing.Point(24, 228);
+ this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(180, 40);
+ this.label2.Size = new System.Drawing.Size(360, 80);
this.label2.TabIndex = 2;
this.label2.Text = "关键零件号2:";
//
// textBox3
//
this.textBox3.Font = new System.Drawing.Font("微软雅黑", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox3.Location = new System.Drawing.Point(403, 186);
+ this.textBox3.Location = new System.Drawing.Point(806, 372);
+ this.textBox3.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.textBox3.Name = "textBox3";
- this.textBox3.Size = new System.Drawing.Size(486, 43);
+ this.textBox3.Size = new System.Drawing.Size(968, 78);
this.textBox3.TabIndex = 5;
this.textBox3.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox3_KeyDown);
//
// label3
//
this.label3.Font = new System.Drawing.Font("微软雅黑", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label3.Location = new System.Drawing.Point(12, 189);
+ this.label3.Location = new System.Drawing.Point(24, 378);
+ this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(180, 40);
+ this.label3.Size = new System.Drawing.Size(360, 80);
this.label3.TabIndex = 4;
this.label3.Text = "关键零件号3:";
//
@@ -107,9 +113,10 @@
//
this.button1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
this.button1.Font = new System.Drawing.Font("微软雅黑", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button1.Location = new System.Drawing.Point(742, 470);
+ this.button1.Location = new System.Drawing.Point(1484, 940);
+ this.button1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(147, 55);
+ this.button1.Size = new System.Drawing.Size(294, 110);
this.button1.TabIndex = 6;
this.button1.Text = "关闭";
this.button1.UseVisualStyleBackColor = false;
@@ -119,9 +126,10 @@
//
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("微软雅黑", 20F);
- this.label4.Location = new System.Drawing.Point(184, 46);
+ this.label4.Location = new System.Drawing.Point(368, 92);
+ this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(92, 35);
+ this.label4.Size = new System.Drawing.Size(185, 70);
this.label4.TabIndex = 7;
this.label4.Text = "label4";
//
@@ -129,9 +137,10 @@
//
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("微软雅黑", 20F);
- this.label5.Location = new System.Drawing.Point(184, 119);
+ this.label5.Location = new System.Drawing.Point(368, 238);
+ this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(92, 35);
+ this.label5.Size = new System.Drawing.Size(185, 70);
this.label5.TabIndex = 8;
this.label5.Text = "label5";
//
@@ -139,9 +148,10 @@
//
this.label6.AutoSize = true;
this.label6.Font = new System.Drawing.Font("微软雅黑", 20F);
- this.label6.Location = new System.Drawing.Point(184, 194);
+ this.label6.Location = new System.Drawing.Point(368, 388);
+ this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(92, 35);
+ this.label6.Size = new System.Drawing.Size(185, 70);
this.label6.TabIndex = 9;
this.label6.Text = "label6";
//
@@ -149,27 +159,30 @@
//
this.label7.AutoSize = true;
this.label7.Font = new System.Drawing.Font("微软雅黑", 20F);
- this.label7.Location = new System.Drawing.Point(184, 267);
+ this.label7.Location = new System.Drawing.Point(368, 534);
+ this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(92, 35);
+ this.label7.Size = new System.Drawing.Size(185, 70);
this.label7.TabIndex = 12;
this.label7.Text = "label7";
//
// textBox4
//
this.textBox4.Font = new System.Drawing.Font("微软雅黑", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox4.Location = new System.Drawing.Point(403, 259);
+ this.textBox4.Location = new System.Drawing.Point(806, 518);
+ this.textBox4.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.textBox4.Name = "textBox4";
- this.textBox4.Size = new System.Drawing.Size(486, 43);
+ this.textBox4.Size = new System.Drawing.Size(968, 78);
this.textBox4.TabIndex = 11;
this.textBox4.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox4_KeyDown);
//
// label8
//
this.label8.Font = new System.Drawing.Font("微软雅黑", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label8.Location = new System.Drawing.Point(12, 262);
+ this.label8.Location = new System.Drawing.Point(24, 524);
+ this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(180, 40);
+ this.label8.Size = new System.Drawing.Size(360, 80);
this.label8.TabIndex = 10;
this.label8.Text = "关键零件号4:";
//
@@ -177,27 +190,30 @@
//
this.label9.AutoSize = true;
this.label9.Font = new System.Drawing.Font("微软雅黑", 20F);
- this.label9.Location = new System.Drawing.Point(184, 341);
+ this.label9.Location = new System.Drawing.Point(368, 682);
+ this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(92, 35);
+ this.label9.Size = new System.Drawing.Size(185, 70);
this.label9.TabIndex = 15;
this.label9.Text = "label9";
//
// textBox5
//
this.textBox5.Font = new System.Drawing.Font("微软雅黑", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox5.Location = new System.Drawing.Point(403, 333);
+ this.textBox5.Location = new System.Drawing.Point(806, 666);
+ this.textBox5.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.textBox5.Name = "textBox5";
- this.textBox5.Size = new System.Drawing.Size(486, 43);
+ this.textBox5.Size = new System.Drawing.Size(968, 78);
this.textBox5.TabIndex = 14;
this.textBox5.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox5_KeyDown);
//
// label10
//
this.label10.Font = new System.Drawing.Font("微软雅黑", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label10.Location = new System.Drawing.Point(12, 336);
+ this.label10.Location = new System.Drawing.Point(24, 672);
+ this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(180, 40);
+ this.label10.Size = new System.Drawing.Size(360, 80);
this.label10.TabIndex = 13;
this.label10.Text = "关键零件号5:";
//
@@ -205,35 +221,39 @@
//
this.label11.AutoSize = true;
this.label11.Font = new System.Drawing.Font("微软雅黑", 20F);
- this.label11.Location = new System.Drawing.Point(184, 418);
+ this.label11.Location = new System.Drawing.Point(368, 836);
+ this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(108, 35);
+ this.label11.Size = new System.Drawing.Size(217, 70);
this.label11.TabIndex = 18;
this.label11.Text = "label11";
//
// textBox6
//
this.textBox6.Font = new System.Drawing.Font("微软雅黑", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox6.Location = new System.Drawing.Point(403, 410);
+ this.textBox6.Location = new System.Drawing.Point(806, 820);
+ this.textBox6.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.textBox6.Name = "textBox6";
- this.textBox6.Size = new System.Drawing.Size(486, 43);
+ this.textBox6.Size = new System.Drawing.Size(968, 78);
this.textBox6.TabIndex = 17;
this.textBox6.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox6_KeyDown);
//
// label12
//
this.label12.Font = new System.Drawing.Font("微软雅黑", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label12.Location = new System.Drawing.Point(12, 413);
+ this.label12.Location = new System.Drawing.Point(24, 826);
+ this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(180, 40);
+ this.label12.Size = new System.Drawing.Size(360, 80);
this.label12.TabIndex = 16;
this.label12.Text = "关键零件号6:";
//
// FrmProScreen3
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(917, 543);
+ this.BackColor = System.Drawing.Color.SteelBlue;
+ this.ClientSize = new System.Drawing.Size(1834, 1086);
this.Controls.Add(this.label11);
this.Controls.Add(this.textBox6);
this.Controls.Add(this.label12);
@@ -254,6 +274,7 @@
this.Controls.Add(this.textBox1);
this.Controls.Add(this.label1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+ this.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.Name = "FrmProScreen3";
this.Text = " ";
this.Load += new System.EventHandler(this.FrmProScreen3_Load);
diff --git a/PunchingMistake/FrmProScreen3.cs b/PunchingMistake/FrmProScreen3.cs
index 2bbf77a..f79a433 100644
--- a/PunchingMistake/FrmProScreen3.cs
+++ b/PunchingMistake/FrmProScreen3.cs
@@ -15,12 +15,44 @@ namespace PunchingMistake
OtherPart parts = new OtherPart();
private static string productID3 = "", productID4 = "", productID5 = "", productID6 = "", productID7 = "", productID8 = "";
int[] isCheck = new int[6] { 0, 0, 0, 0, 0, 0 };
-
+ public event Action ScanCompleted = null;
private List _needScanRows = new List();
public FrmProScreen3(List needScanRows)
{
InitializeComponent();
this._needScanRows = needScanRows;
+ this.StartPosition = FormStartPosition.CenterParent;
+ foreach(DataRow dr in needScanRows)
+ {
+
+ }
+ for(int i =0;i< needScanRows.Count; i++)
+ {
+ if(i == 0)
+ {
+ parts.productID3 = needScanRows[i]["PartNo2"].ToString();
+ }
+ if (i == 1)
+ {
+ parts.productID4 = needScanRows[i]["PartNo2"].ToString();
+ }
+ if (i == 2)
+ {
+ parts.productID5 = needScanRows[i]["PartNo2"].ToString();
+ }
+ if (i == 3)
+ {
+ parts.productID6 = needScanRows[i]["PartNo2"].ToString();
+ }
+ if (i == 4)
+ {
+ parts.productID7 = needScanRows[i]["PartNo2"].ToString();
+ }
+ if (i == 5)
+ {
+ parts.productID8 = needScanRows[i]["PartNo2"].ToString();
+ }
+ }
}
public FrmProScreen3(OtherPart part)
@@ -89,591 +121,121 @@ namespace PunchingMistake
}
}
-
- private void textBox1_KeyDown(object sender, KeyEventArgs e)
+ void ScanBarCode(int lbIndex)
{
- if (e.KeyCode == Keys.Enter)
+ //string barcode = textBox1.Text.Trim();
+ string partProductID = string.Empty;
+ string productID = string.Empty;
+ if(lbIndex == 0)
{
- string barcode = textBox1.Text.Trim();
-
- productID3 = Function2.GetProductID(barcode);
- if (parts.productID3 == productID3)
- {
- isCheck[0] = 1;
- if (textBox2.Enabled)
- {
- textBox2.Text = "";
- textBox2.Focus();
- }
- else if (textBox3.Enabled)
- {
- textBox3.Text = "";
- textBox3.Focus();
- }
- else if (textBox4.Enabled)
- {
- textBox4.Text = "";
- textBox4.Focus();
- }
- else if (textBox5.Enabled)
- {
- textBox5.Text = "";
- textBox5.Focus();
- }
- else if (textBox6.Enabled)
- {
- textBox6.Text = "";
- textBox6.Focus();
- }
- else
- {
- isCheck[1] = 1;
- isCheck[2] = 1;
- isCheck[3] = 1;
- isCheck[4] = 1;
- isCheck[5] = 1;
-
- #region 判断关键零件是否都校验
-
- if (isCheck[0] == 0)
- {
- MessageBox.Show("关键零件号1未校验！");
- textBox1.SelectAll();
- textBox1.Focus();
- return;
- }
- if (isCheck[1] == 0)
- {
- MessageBox.Show("关键零件号2未校验！");
- textBox2.SelectAll();
- textBox2.Focus();
- return;
- }
- if (isCheck[2] == 0)
- {
- MessageBox.Show("关键零件号3未校验！");
- textBox3.SelectAll();
- textBox3.Focus();
- return;
- }
- if (isCheck[3] == 0)
- {
- MessageBox.Show("关键零件号4未校验！");
- textBox4.SelectAll();
- textBox4.Focus();
- return;
- }
- if (isCheck[4] == 0)
- {
- MessageBox.Show("关键零件号5未校验！");
- textBox5.SelectAll();
- textBox5.Focus();
- return;
- }
- if (isCheck[5] == 0)
- {
- MessageBox.Show("关键零件号6未校验！");
- textBox6.SelectAll();
- textBox6.Focus();
- return;
- }
-
- #endregion
-
- ScanAll.ScanResult = true;
- ScanAll.barCode1 = textBox1.Text.Trim();
- ScanAll.partNo1 = Function2.GetPartNoByID(productID3);
- ScanAll.barCode2 = textBox2.Text.Trim();
- ScanAll.partNo2 = "";
- ScanAll.barCode3 = textBox3.Text.Trim();
- ScanAll.partNo3 = "";
-
- ScanAll.barCode4 = textBox4.Text.Trim();
- ScanAll.partNo4 = "";
- ScanAll.barCode5 = textBox5.Text.Trim();
- ScanAll.partNo5 = "";
- ScanAll.barCode6 = textBox6.Text.Trim();
- ScanAll.partNo6 = "";
-
- this.Close();
- }
- }
- else
- {
- MessageBox.Show("扫入条码与总成不匹配，请检查后再次扫描");
- textBox1.Text = "";
- }
+ productID = productID3 = Function2.GetProductNo(textBox1.Text.Trim());
+ partProductID = parts.productID3;
}
- }
-
- private void textBox2_KeyDown(object sender, KeyEventArgs e)
- {
- if (e.KeyCode == Keys.Enter)
+ else if (lbIndex == 1)
{
- string barcode = textBox2.Text.Trim();
- productID4 = Function2.GetProductID(barcode);
- if (parts.productID4 == productID4)
- {
- isCheck[1] = 1;
-
- if (textBox3.Enabled)
- {
- textBox3.Text = "";
- textBox3.Focus();
- }
- else if (textBox4.Enabled)
- {
- textBox4.Text = "";
- textBox4.Focus();
- }
- else if (textBox5.Enabled)
- {
- textBox5.Text = "";
- textBox5.Focus();
- }
- else if (textBox6.Enabled)
- {
- textBox6.Text = "";
- textBox6.Focus();
- }
- else
- {
- isCheck[2] = 1;
- isCheck[3] = 1;
- isCheck[4] = 1;
- isCheck[5] = 1;
-
- #region 判断关键零件是否都校验
-
- if (isCheck[0] == 0)
- {
- MessageBox.Show("关键零件号1未校验！");
- textBox2.Text = "";
- textBox1.SelectAll();
- textBox1.Focus();
- return;
- }
- if (isCheck[1] == 0)
- {
- MessageBox.Show("关键零件号2未校验！");
- textBox2.SelectAll();
- textBox2.Focus();
- return;
- }
- if (isCheck[2] == 0)
- {
- MessageBox.Show("关键零件号3未校验！");
- textBox3.SelectAll();
- textBox3.Focus();
- return;
- }
- if (isCheck[3] == 0)
- {
- MessageBox.Show("关键零件号4未校验！");
- textBox4.SelectAll();
- textBox4.Focus();
- return;
- }
- if (isCheck[4] == 0)
- {
- MessageBox.Show("关键零件号54未校验！");
- textBox5.SelectAll();
- textBox5.Focus();
- return;
- }
- if (isCheck[5] == 0)
- {
- MessageBox.Show("关键零件号6未校验！");
- textBox6.SelectAll();
- textBox6.Focus();
- return;
- }
-
- #endregion
-
- ScanAll.ScanResult = true;
- ScanAll.barCode1 = textBox1.Text.Trim();
- ScanAll.partNo1 = Function2.GetPartNoByID(productID3);
- ScanAll.barCode2 = textBox2.Text.Trim();
- ScanAll.partNo2 = Function2.GetPartNoByID(productID4);
- ScanAll.barCode3 = textBox3.Text.Trim();
- ScanAll.partNo3 = "";
-
- ScanAll.barCode4 = textBox4.Text.Trim();
- ScanAll.partNo4 = "";
- ScanAll.barCode5 = textBox5.Text.Trim();
- ScanAll.partNo5 = "";
- ScanAll.barCode6 = textBox6.Text.Trim();
- ScanAll.partNo6 = "";
- this.Close();
- }
- }
- else
- {
- MessageBox.Show("扫入条码与总成不匹配，请检查后再次扫描");
- textBox2.Text = "";
- }
+ productID = productID4 = Function2.GetProductNo(textBox2.Text.Trim());
+ partProductID = parts.productID4;
+ }
+ else if (lbIndex == 2)
+ {
+ productID = productID5 = Function2.GetProductNo(textBox3.Text.Trim());
+ partProductID = parts.productID5;
+ }
+ else if (lbIndex == 3)
+ {
+ productID = productID6 = Function2.GetProductNo(textBox4.Text.Trim());
+ partProductID = parts.productID6;
+ }
+ else if (lbIndex == 4)
+ {
+ productID = productID7 = Function2.GetProductNo(textBox5.Text.Trim());
+ partProductID = parts.productID7;
+ }
+ else if (lbIndex == 5)
+ {
+ productID = productID8 = Function2.GetProductNo(textBox6.Text.Trim());
+ partProductID = parts.productID8;
}
- }
- private void textBox3_KeyDown(object sender, KeyEventArgs e)
- {
- if (e.KeyCode == Keys.Enter)
+ if (partProductID == productID)
{
- string barcode = textBox3.Text.Trim();
- productID5 = Function2.GetProductID(barcode);
- if (parts.productID5 == productID5)
+ isCheck[lbIndex] = 1;
+ if (textBox2.Enabled && lbIndex ==0)
{
- isCheck[2] = 1;
-
- if (textBox4.Enabled)
- {
- textBox4.Text = "";
- textBox4.Focus();
- }
- else if (textBox5.Enabled)
- {
- textBox5.Text = "";
- textBox5.Focus();
- }
- else if (textBox6.Enabled)
- {
- textBox6.Text = "";
- textBox6.Focus();
- }
- else
- {
- isCheck[3] = 1;
- isCheck[4] = 1;
- isCheck[5] = 1;
-
- #region 判断关键零件是否都校验
-
- if (isCheck[0] == 0)
- {
- MessageBox.Show("关键零件号1未校验！");
- textBox3.Text = "";
- textBox1.SelectAll();
- textBox1.Focus();
- return;
- }
- if (isCheck[1] == 0)
- {
- MessageBox.Show("关键零件号2未校验！");
- textBox3.Text = "";
- textBox2.SelectAll();
- textBox2.Focus();
- return;
- }
- if (isCheck[2] == 0)
- {
- MessageBox.Show("关键零件号3未校验！");
- textBox3.SelectAll();
- textBox3.Focus();
- return;
- }
- if (isCheck[3] == 0)
- {
- MessageBox.Show("关键零件号4未校验！");
- textBox4.SelectAll();
- textBox4.Focus();
- return;
- }
- if (isCheck[4] == 0)
- {
- MessageBox.Show("关键零件号5未校验！");
- textBox5.SelectAll();
- textBox5.Focus();
- return;
- }
- if (isCheck[5] == 0)
- {
- MessageBox.Show("关键零件号5未校验！");
- textBox6.SelectAll();
- textBox6.Focus();
- return;
- }
-
- #endregion
-
- ScanAll.ScanResult = true;
- ScanAll.barCode1 = textBox1.Text.Trim();
- ScanAll.partNo1 = Function2.GetPartNoByID(productID3);
- ScanAll.barCode2 = textBox2.Text.Trim();
- ScanAll.partNo2 = Function2.GetPartNoByID(productID4);
- ScanAll.barCode3 = textBox3.Text.Trim();
- ScanAll.partNo3 = Function2.GetPartNoByID(productID5);
-
- ScanAll.barCode4 = textBox4.Text.Trim();
- ScanAll.partNo4 = "";
- ScanAll.barCode5 = textBox5.Text.Trim();
- ScanAll.partNo5 = "";
- ScanAll.barCode6 = textBox6.Text.Trim();
- ScanAll.partNo6 = "";
- this.Close();
- }
+ textBox2.Text = "";
+ textBox2.Focus();
}
- else
+ else if (textBox3.Enabled && lbIndex == 1)
{
- MessageBox.Show("扫入条码与总成不匹配，请检查后再次扫描");
textBox3.Text = "";
+ textBox3.Focus();
}
- }
- }
-
- private void button1_Click(object sender, EventArgs e)
- {
- ScanAll.ScanResult = false;
- this.Close();
- }
-
- private void textBox4_KeyDown(object sender, KeyEventArgs e)
- {
- if (e.KeyCode == Keys.Enter)
- {
- string barcode = textBox4.Text.Trim();
- productID6 = Function2.GetProductID(barcode);
- if (parts.productID6 == productID6)
- {
- isCheck[3] = 1;
-
- if (textBox5.Enabled)
- {
- textBox5.Text = "";
- textBox5.Focus();
- }
- else if (textBox6.Enabled)
- {
- textBox6.Text = "";
- textBox6.Focus();
- }
- else
- {
- isCheck[4] = 1;
- isCheck[5] = 1;
-
- #region 判断关键零件是否都校验
-
- if (isCheck[0] == 0)
- {
- MessageBox.Show("关键零件号1未校验！");
- textBox4.Text = "";
- textBox1.SelectAll();
- textBox1.Focus();
- return;
- }
- if (isCheck[1] == 0)
- {
- MessageBox.Show("关键零件号2未校验！");
- textBox4.Text = "";
- textBox2.SelectAll();
- textBox2.Focus();
- return;
- }
- if (isCheck[2] == 0)
- {
- MessageBox.Show("关键零件号3未校验！");
- textBox4.Text = "";
- textBox3.SelectAll();
- textBox3.Focus();
- return;
- }
- if (isCheck[3] == 0)
- {
- MessageBox.Show("关键零件号4未校验！");
- textBox4.SelectAll();
- textBox4.Focus();
- return;
- }
- if (isCheck[4] == 0)
- {
- MessageBox.Show("关键零件号5未校验！");
- textBox5.SelectAll();
- textBox5.Focus();
- return;
- }
- if (isCheck[5] == 0)
- {
- MessageBox.Show("关键零件号6未校验！");
- textBox6.SelectAll();
- textBox6.Focus();
- return;
- }
-
- #endregion
-
- ScanAll.ScanResult = true;
- ScanAll.barCode1 = textBox1.Text.Trim();
- ScanAll.partNo1 = Function2.GetPartNoByID(productID3);
- ScanAll.barCode2 = textBox2.Text.Trim();
- ScanAll.partNo2 = Function2.GetPartNoByID(productID4);
- ScanAll.barCode3 = textBox3.Text.Trim();
- ScanAll.partNo3 = Function2.GetPartNoByID(productID5);
-
- ScanAll.barCode4 = textBox4.Text.Trim();
- ScanAll.partNo4 = Function2.GetPartNoByID(productID6);
- ScanAll.barCode5 = textBox5.Text.Trim();
- ScanAll.partNo5 = "";
- ScanAll.barCode6 = textBox6.Text.Trim();
- ScanAll.partNo6 = "";
- this.Close();
- }
- }
- else
+ else if (textBox4.Enabled && lbIndex == 2)
{
- MessageBox.Show("扫入条码与总成不匹配，请检查后再次扫描");
textBox4.Text = "";
+ textBox4.Focus();
}
- }
- }
-
- private void textBox5_KeyDown(object sender, KeyEventArgs e)
- {
- if (e.KeyCode == Keys.Enter)
- {
- string barcode = textBox5.Text.Trim();
- productID7 = Function2.GetProductID(barcode);
- if (parts.productID7 == productID7)
+ else if (textBox5.Enabled && lbIndex == 3)
{
- isCheck[4] = 1;
-
- if (textBox6.Enabled)
- {
- textBox6.Text = "";
- textBox6.Focus();
- }
- else
- {
- isCheck[5] = 1;
-
- #region 判断关键零件是否都校验
-
- if (isCheck[0] == 0)
- {
- MessageBox.Show("关键零件号1未校验！");
- textBox5.Text = "";
- textBox1.SelectAll();
- textBox1.Focus();
- return;
- }
- if (isCheck[1] == 0)
- {
- MessageBox.Show("关键零件号2未校验！");
- textBox5.Text = "";
- textBox2.SelectAll();
- textBox2.Focus();
- return;
- }
- if (isCheck[2] == 0)
- {
- MessageBox.Show("关键零件号3未校验！");
- textBox3.SelectAll();
- textBox3.Focus();
- return;
- }
- if (isCheck[3] == 0)
- {
- MessageBox.Show("关键零件号4未校验！");
- textBox5.Text = "";
- textBox4.SelectAll();
- textBox4.Focus();
- return;
- }
- if (isCheck[4] == 0)
- {
- MessageBox.Show("关键零件号5未校验！");
- textBox5.SelectAll();
- textBox5.Focus();
- return;
- }
- if (isCheck[5] == 0)
- {
- MessageBox.Show("关键零件号6未校验！");
- textBox6.SelectAll();
- textBox6.Focus();
- return;
- }
-
- #endregion
-
- ScanAll.ScanResult = true;
- ScanAll.barCode1 = textBox1.Text.Trim();
- ScanAll.partNo1 = Function2.GetPartNoByID(productID3);
- ScanAll.barCode2 = textBox2.Text.Trim();
- ScanAll.partNo2 = Function2.GetPartNoByID(productID4);
- ScanAll.barCode3 = textBox3.Text.Trim();
- ScanAll.partNo3 = Function2.GetPartNoByID(productID5);
-
- ScanAll.barCode4 = textBox4.Text.Trim();
- ScanAll.partNo4 = Function2.GetPartNoByID(productID6);
- ScanAll.barCode5 = textBox5.Text.Trim();
- ScanAll.partNo5 = Function2.GetPartNoByID(productID7);
- ScanAll.barCode6 = textBox6.Text.Trim();
- ScanAll.partNo6 = "";
- this.Close();
- }
+ textBox5.Text = "";
+ textBox5.Focus();
}
- else
+ else if (textBox6.Enabled && lbIndex == 4)
{
- MessageBox.Show("扫入条码与总成不匹配，请检查后再次扫描");
- textBox4.Text = "";
+ textBox6.Text = "";
+ textBox6.Focus();
}
- }
- }
-
- private void textBox6_KeyDown(object sender, KeyEventArgs e)
- {
- if (e.KeyCode == Keys.Enter)
- {
- string barcode = textBox6.Text.Trim();
- productID8 = Function2.GetProductID(barcode);
- if (parts.productID8 == productID8)
+ else
{
- isCheck[5] = 1;
+ if(lbIndex >0)
+ isCheck[1] = 1;
+ if (lbIndex > 1)
+ isCheck[2] = 1;
+ if (lbIndex > 2)
+ isCheck[3] = 1;
+ if (lbIndex > 3)
+ isCheck[4] = 1;
+ if (lbIndex > 4)
+ isCheck[5] = 1;
#region 判断关键零件是否都校验
- if (isCheck[0] == 0)
+ if (isCheck[0] == 0 && lbIndex >= 0)
{
MessageBox.Show("关键零件号1未校验！");
- textBox6.Text = "";
textBox1.SelectAll();
textBox1.Focus();
return;
}
- if (isCheck[1] == 0)
+ if (isCheck[1] == 0 && lbIndex >= 1)
{
MessageBox.Show("关键零件号2未校验！");
- textBox6.Text = "";
textBox2.SelectAll();
textBox2.Focus();
return;
}
- if (isCheck[2] == 0)
+ if (isCheck[2] == 0 && lbIndex >= 2)
{
MessageBox.Show("关键零件号3未校验！");
- textBox6.Text = "";
textBox3.SelectAll();
textBox3.Focus();
return;
}
- if (isCheck[3] == 0)
+ if (isCheck[3] == 0 && lbIndex >= 3)
{
MessageBox.Show("关键零件号4未校验！");
- textBox6.Text = "";
textBox4.SelectAll();
textBox4.Focus();
return;
}
- if (isCheck[4] == 0)
+ if (isCheck[4] == 0 && lbIndex >= 4)
{
MessageBox.Show("关键零件号5未校验！");
- textBox6.Text = "";
textBox5.SelectAll();
textBox5.Focus();
return;
}
- if (isCheck[5] == 0)
+ if (isCheck[5] == 0 && lbIndex >= 5)
{
MessageBox.Show("关键零件号6未校验！");
textBox6.SelectAll();
@@ -685,25 +247,672 @@ namespace PunchingMistake
ScanAll.ScanResult = true;
ScanAll.barCode1 = textBox1.Text.Trim();
- ScanAll.partNo1 = Function2.GetPartNoByID(productID3);
+ if (lbIndex >= 0)
+ ScanAll.partNo1 = productID3; // Function2.GetPartNoByID(productID3);
+
ScanAll.barCode2 = textBox2.Text.Trim();
- ScanAll.partNo2 = Function2.GetPartNoByID(productID4);
+ if (lbIndex >= 1)
+ ScanAll.partNo2 = productID4; // Function2.GetPartNoByID(productID4);
+ else
+ ScanAll.partNo2 = "";
+
ScanAll.barCode3 = textBox3.Text.Trim();
- ScanAll.partNo3 = Function2.GetPartNoByID(productID5);
+ if (lbIndex >= 2)
+ ScanAll.partNo3 = productID5;// Function2.GetPartNoByID(productID5);
+ else
+ ScanAll.partNo3 = "";
ScanAll.barCode4 = textBox4.Text.Trim();
- ScanAll.partNo4 = Function2.GetPartNoByID(productID6);
+ if (lbIndex >= 3)
+ ScanAll.partNo4 = productID6; // Function2.GetPartNoByID(productID6);
+ else
+ ScanAll.partNo4 = "";
+
ScanAll.barCode5 = textBox5.Text.Trim();
- ScanAll.partNo5 = Function2.GetPartNoByID(productID7);
+ if (lbIndex >= 4)
+ ScanAll.partNo5 = productID7;// Function2.GetPartNoByID(productID7);
+ else
+ ScanAll.partNo5 = "";
ScanAll.barCode6 = textBox6.Text.Trim();
- ScanAll.partNo6 = Function2.GetPartNoByID(productID8);
+
+ if (lbIndex >= 5)
+ ScanAll.partNo6 = productID8; // Function2.GetPartNoByID(productID8);
+ else
+ ScanAll.partNo6 = "";
+
this.Close();
+ ScanCompleted?.Invoke(true);
+
}
- else
- {
- MessageBox.Show("扫入条码与总成不匹配，请检查后再次扫描");
- textBox4.Text = "";
- }
+ }
+ else
+ {
+ MessageBox.Show("扫入条码与总成不匹配，请检查后再次扫描");
+ textBox1.Text = "";
+ }
+ }
+
+ private void textBox1_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Enter)
+ {
+ ScanBarCode(0);
+ //string barcode = textBox1.Text.Trim();
+
+ //productID3 = Function2.GetProductNo(barcode);
+ //if (parts.productID3 == productID3)
+ //{
+ // isCheck[0] = 1;
+ // if (textBox2.Enabled)
+ // {
+ // textBox2.Text = "";
+ // textBox2.Focus();
+ // }
+ // else if (textBox3.Enabled)
+ // {
+ // textBox3.Text = "";
+ // textBox3.Focus();
+ // }
+ // else if (textBox4.Enabled)
+ // {
+ // textBox4.Text = "";
+ // textBox4.Focus();
+ // }
+ // else if (textBox5.Enabled)
+ // {
+ // textBox5.Text = "";
+ // textBox5.Focus();
+ // }
+ // else if (textBox6.Enabled)
+ // {
+ // textBox6.Text = "";
+ // textBox6.Focus();
+ // }
+ // else
+ // {
+ // isCheck[1] = 1;
+ // isCheck[2] = 1;
+ // isCheck[3] = 1;
+ // isCheck[4] = 1;
+ // isCheck[5] = 1;
+
+ // #region 判断关键零件是否都校验
+
+ // if (isCheck[0] == 0)
+ // {
+ // MessageBox.Show("关键零件号1未校验！");
+ // textBox1.SelectAll();
+ // textBox1.Focus();
+ // return;
+ // }
+ // if (isCheck[1] == 0)
+ // {
+ // MessageBox.Show("关键零件号2未校验！");
+ // textBox2.SelectAll();
+ // textBox2.Focus();
+ // return;
+ // }
+ // if (isCheck[2] == 0)
+ // {
+ // MessageBox.Show("关键零件号3未校验！");
+ // textBox3.SelectAll();
+ // textBox3.Focus();
+ // return;
+ // }
+ // if (isCheck[3] == 0)
+ // {
+ // MessageBox.Show("关键零件号4未校验！");
+ // textBox4.SelectAll();
+ // textBox4.Focus();
+ // return;
+ // }
+ // if (isCheck[4] == 0)
+ // {
+ // MessageBox.Show("关键零件号5未校验！");
+ // textBox5.SelectAll();
+ // textBox5.Focus();
+ // return;
+ // }
+ // if (isCheck[5] == 0)
+ // {
+ // MessageBox.Show("关键零件号6未校验！");
+ // textBox6.SelectAll();
+ // textBox6.Focus();
+ // return;
+ // }
+
+ // #endregion
+
+ // ScanAll.ScanResult = true;
+ // ScanAll.barCode1 = textBox1.Text.Trim();
+ // ScanAll.partNo1 = Function2.GetPartNoByID(productID3);
+ // ScanAll.barCode2 = textBox2.Text.Trim();
+ // ScanAll.partNo2 = "";
+ // ScanAll.barCode3 = textBox3.Text.Trim();
+ // ScanAll.partNo3 = "";
+
+ // ScanAll.barCode4 = textBox4.Text.Trim();
+ // ScanAll.partNo4 = "";
+ // ScanAll.barCode5 = textBox5.Text.Trim();
+ // ScanAll.partNo5 = "";
+ // ScanAll.barCode6 = textBox6.Text.Trim();
+ // ScanAll.partNo6 = "";
+
+ // this.Close();
+ // }
+ //}
+ //else
+ //{
+ // MessageBox.Show("扫入条码与总成不匹配，请检查后再次扫描");
+ // textBox1.Text = "";
+ //}
+ }
+ }
+
+ private void textBox2_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Enter)
+ {
+ ScanBarCode(1);
+ //string barcode = textBox2.Text.Trim();
+ //productID4 = Function2.GetProductNo(barcode);
+ //if (parts.productID4 == productID4)
+ //{
+ // isCheck[1] = 1;
+
+ // if (textBox3.Enabled)
+ // {
+ // textBox3.Text = "";
+ // textBox3.Focus();
+ // }
+ // else if (textBox4.Enabled)
+ // {
+ // textBox4.Text = "";
+ // textBox4.Focus();
+ // }
+ // else if (textBox5.Enabled)
+ // {
+ // textBox5.Text = "";
+ // textBox5.Focus();
+ // }
+ // else if (textBox6.Enabled)
+ // {
+ // textBox6.Text = "";
+ // textBox6.Focus();
+ // }
+ // else
+ // {
+ // isCheck[2] = 1;
+ // isCheck[3] = 1;
+ // isCheck[4] = 1;
+ // isCheck[5] = 1;
+
+ // #region 判断关键零件是否都校验
+
+ // if (isCheck[0] == 0)
+ // {
+ // MessageBox.Show("关键零件号1未校验！");
+ // textBox2.Text = "";
+ // textBox1.SelectAll();
+ // textBox1.Focus();
+ // return;
+ // }
+ // if (isCheck[1] == 0)
+ // {
+ // MessageBox.Show("关键零件号2未校验！");
+ // textBox2.SelectAll();
+ // textBox2.Focus();
+ // return;
+ // }
+ // if (isCheck[2] == 0)
+ // {
+ // MessageBox.Show("关键零件号3未校验！");
+ // textBox3.SelectAll();
+ // textBox3.Focus();
+ // return;
+ // }
+ // if (isCheck[3] == 0)
+ // {
+ // MessageBox.Show("关键零件号4未校验！");
+ // textBox4.SelectAll();
+ // textBox4.Focus();
+ // return;
+ // }
+ // if (isCheck[4] == 0)
+ // {
+ // MessageBox.Show("关键零件号54未校验！");
+ // textBox5.SelectAll();
+ // textBox5.Focus();
+ // return;
+ // }
+ // if (isCheck[5] == 0)
+ // {
+ // MessageBox.Show("关键零件号6未校验！");
+ // textBox6.SelectAll();
+ // textBox6.Focus();
+ // return;
+ // }
+
+ // #endregion
+
+ // ScanAll.ScanResult = true;
+ // ScanAll.barCode1 = textBox1.Text.Trim();
+ // ScanAll.partNo1 = Function2.GetPartNoByID(productID3);
+ // ScanAll.barCode2 = textBox2.Text.Trim();
+ // ScanAll.partNo2 = Function2.GetPartNoByID(productID4);
+ // ScanAll.barCode3 = textBox3.Text.Trim();
+ // ScanAll.partNo3 = "";
+
+ // ScanAll.barCode4 = textBox4.Text.Trim();
+ // ScanAll.partNo4 = "";
+ // ScanAll.barCode5 = textBox5.Text.Trim();
+ // ScanAll.partNo5 = "";
+ // ScanAll.barCode6 = textBox6.Text.Trim();
+ // ScanAll.partNo6 = "";
+ // this.Close();
+ // }
+ //}
+ //else
+ //{
+ // MessageBox.Show("扫入条码与总成不匹配，请检查后再次扫描");
+ // textBox2.Text = "";
+ //}
+ }
+ }
+
+ private void textBox3_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Enter)
+ {
+ ScanBarCode(2);
+ //string barcode = textBox3.Text.Trim();
+ //productID5 = Function2.GetProductID(barcode);
+ //if (parts.productID5 == productID5)
+ //{
+ // isCheck[2] = 1;
+
+ // if (textBox4.Enabled)
+ // {
+ // textBox4.Text = "";
+ // textBox4.Focus();
+ // }
+ // else if (textBox5.Enabled)
+ // {
+ // textBox5.Text = "";
+ // textBox5.Focus();
+ // }
+ // else if (textBox6.Enabled)
+ // {
+ // textBox6.Text = "";
+ // textBox6.Focus();
+ // }
+ // else
+ // {
+ // isCheck[3] = 1;
+ // isCheck[4] = 1;
+ // isCheck[5] = 1;
+
+ // #region 判断关键零件是否都校验
+
+ // if (isCheck[0] == 0)
+ // {
+ // MessageBox.Show("关键零件号1未校验！");
+ // textBox3.Text = "";
+ // textBox1.SelectAll();
+ // textBox1.Focus();
+ // return;
+ // }
+ // if (isCheck[1] == 0)
+ // {
+ // MessageBox.Show("关键零件号2未校验！");
+ // textBox3.Text = "";
+ // textBox2.SelectAll();
+ // textBox2.Focus();
+ // return;
+ // }
+ // if (isCheck[2] == 0)
+ // {
+ // MessageBox.Show("关键零件号3未校验！");
+ // textBox3.SelectAll();
+ // textBox3.Focus();
+ // return;
+ // }
+ // if (isCheck[3] == 0)
+ // {
+ // MessageBox.Show("关键零件号4未校验！");
+ // textBox4.SelectAll();
+ // textBox4.Focus();
+ // return;
+ // }
+ // if (isCheck[4] == 0)
+ // {
+ // MessageBox.Show("关键零件号5未校验！");
+ // textBox5.SelectAll();
+ // textBox5.Focus();
+ // return;
+ // }
+ // if (isCheck[5] == 0)
+ // {
+ // MessageBox.Show("关键零件号5未校验！");
+ // textBox6.SelectAll();
+ // textBox6.Focus();
+ // return;
+ // }
+
+ // #endregion
+
+ // ScanAll.ScanResult = true;
+ // ScanAll.barCode1 = textBox1.Text.Trim();
+ // ScanAll.partNo1 = Function2.GetPartNoByID(productID3);
+ // ScanAll.barCode2 = textBox2.Text.Trim();
+ // ScanAll.partNo2 = Function2.GetPartNoByID(productID4);
+ // ScanAll.barCode3 = textBox3.Text.Trim();
+ // ScanAll.partNo3 = Function2.GetPartNoByID(productID5);
+
+ // ScanAll.barCode4 = textBox4.Text.Trim();
+ // ScanAll.partNo4 = "";
+ // ScanAll.barCode5 = textBox5.Text.Trim();
+ // ScanAll.partNo5 = "";
+ // ScanAll.barCode6 = textBox6.Text.Trim();
+ // ScanAll.partNo6 = "";
+ // this.Close();
+ // }
+ //}
+ //else
+ //{
+ // MessageBox.Show("扫入条码与总成不匹配，请检查后再次扫描");
+ // textBox3.Text = "";
+ //}
+ }
+ }
+
+ private void button1_Click(object sender, EventArgs e)
+ {
+ ScanAll.ScanResult = false;
+ this.Close();
+ ScanCompleted?.Invoke(false);
+ }
+
+ private void textBox4_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Enter)
+ {
+ ScanBarCode(3);
+ //string barcode = textBox4.Text.Trim();
+ //productID6 = Function2.GetProductID(barcode);
+ //if (parts.productID6 == productID6)
+ //{
+ // isCheck[3] = 1;
+
+ // if (textBox5.Enabled)
+ // {
+ // textBox5.Text = "";
+ // textBox5.Focus();
+ // }
+ // else if (textBox6.Enabled)
+ // {
+ // textBox6.Text = "";
+ // textBox6.Focus();
+ // }
+ // else
+ // {
+ // isCheck[4] = 1;
+ // isCheck[5] = 1;
+
+ // #region 判断关键零件是否都校验
+
+ // if (isCheck[0] == 0)
+ // {
+ // MessageBox.Show("关键零件号1未校验！");
+ // textBox4.Text = "";
+ // textBox1.SelectAll();
+ // textBox1.Focus();
+ // return;
+ // }
+ // if (isCheck[1] == 0)
+ // {
+ // MessageBox.Show("关键零件号2未校验！");
+ // textBox4.Text = "";
+ // textBox2.SelectAll();
+ // textBox2.Focus();
+ // return;
+ // }
+ // if (isCheck[2] == 0)
+ // {
+ // MessageBox.Show("关键零件号3未校验！");
+ // textBox4.Text = "";
+ // textBox3.SelectAll();
+ // textBox3.Focus();
+ // return;
+ // }
+ // if (isCheck[3] == 0)
+ // {
+ // MessageBox.Show("关键零件号4未校验！");
+ // textBox4.SelectAll();
+ // textBox4.Focus();
+ // return;
+ // }
+ // if (isCheck[4] == 0)
+ // {
+ // MessageBox.Show("关键零件号5未校验！");
+ // textBox5.SelectAll();
+ // textBox5.Focus();
+ // return;
+ // }
+ // if (isCheck[5] == 0)
+ // {
+ // MessageBox.Show("关键零件号6未校验！");
+ // textBox6.SelectAll();
+ // textBox6.Focus();
+ // return;
+ // }
+
+ // #endregion
+
+ // ScanAll.ScanResult = true;
+ // ScanAll.barCode1 = textBox1.Text.Trim();
+ // ScanAll.partNo1 = Function2.GetPartNoByID(productID3);
+ // ScanAll.barCode2 = textBox2.Text.Trim();
+ // ScanAll.partNo2 = Function2.GetPartNoByID(productID4);
+ // ScanAll.barCode3 = textBox3.Text.Trim();
+ // ScanAll.partNo3 = Function2.GetPartNoByID(productID5);
+
+ // ScanAll.barCode4 = textBox4.Text.Trim();
+ // ScanAll.partNo4 = Function2.GetPartNoByID(productID6);
+ // ScanAll.barCode5 = textBox5.Text.Trim();
+ // ScanAll.partNo5 = "";
+ // ScanAll.barCode6 = textBox6.Text.Trim();
+ // ScanAll.partNo6 = "";
+ // this.Close();
+ // }
+ //}
+ //else
+ //{
+ // MessageBox.Show("扫入条码与总成不匹配，请检查后再次扫描");
+ // textBox4.Text = "";
+ //}
+ }
+ }
+
+ private void textBox5_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Enter)
+ {
+ ScanBarCode(4);
+ //string barcode = textBox5.Text.Trim();
+ //productID7 = Function2.GetProductID(barcode);
+ //if (parts.productID7 == productID7)
+ //{
+ // isCheck[4] = 1;
+
+ // if (textBox6.Enabled)
+ // {
+ // textBox6.Text = "";
+ // textBox6.Focus();
+ // }
+ // else
+ // {
+ // isCheck[5] = 1;
+
+ // #region 判断关键零件是否都校验
+
+ // if (isCheck[0] == 0)
+ // {
+ // MessageBox.Show("关键零件号1未校验！");
+ // textBox5.Text = "";
+ // textBox1.SelectAll();
+ // textBox1.Focus();
+ // return;
+ // }
+ // if (isCheck[1] == 0)
+ // {
+ // MessageBox.Show("关键零件号2未校验！");
+ // textBox5.Text = "";
+ // textBox2.SelectAll();
+ // textBox2.Focus();
+ // return;
+ // }
+ // if (isCheck[2] == 0)
+ // {
+ // MessageBox.Show("关键零件号3未校验！");
+ // textBox3.SelectAll();
+ // textBox3.Focus();
+ // return;
+ // }
+ // if (isCheck[3] == 0)
+ // {
+ // MessageBox.Show("关键零件号4未校验！");
+ // textBox5.Text = "";
+ // textBox4.SelectAll();
+ // textBox4.Focus();
+ // return;
+ // }
+ // if (isCheck[4] == 0)
+ // {
+ // MessageBox.Show("关键零件号5未校验！");
+ // textBox5.SelectAll();
+ // textBox5.Focus();
+ // return;
+ // }
+ // if (isCheck[5] == 0)
+ // {
+ // MessageBox.Show("关键零件号6未校验！");
+ // textBox6.SelectAll();
+ // textBox6.Focus();
+ // return;
+ // }
+
+ // #endregion
+
+ // ScanAll.ScanResult = true;
+ // ScanAll.barCode1 = textBox1.Text.Trim();
+ // ScanAll.partNo1 = Function2.GetPartNoByID(productID3);
+ // ScanAll.barCode2 = textBox2.Text.Trim();
+ // ScanAll.partNo2 = Function2.GetPartNoByID(productID4);
+ // ScanAll.barCode3 = textBox3.Text.Trim();
+ // ScanAll.partNo3 = Function2.GetPartNoByID(productID5);
+
+ // ScanAll.barCode4 = textBox4.Text.Trim();
+ // ScanAll.partNo4 = Function2.GetPartNoByID(productID6);
+ // ScanAll.barCode5 = textBox5.Text.Trim();
+ // ScanAll.partNo5 = Function2.GetPartNoByID(productID7);
+ // ScanAll.barCode6 = textBox6.Text.Trim();
+ // ScanAll.partNo6 = "";
+ // this.Close();
+ // }
+ //}
+ //else
+ //{
+ // MessageBox.Show("扫入条码与总成不匹配，请检查后再次扫描");
+ // textBox4.Text = "";
+ //}
+ }
+ }
+
+ private void textBox6_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Enter)
+ {
+ ScanBarCode(5);
+ //string barcode = textBox6.Text.Trim();
+ //productID8 = Function2.GetProductID(barcode);
+ //if (parts.productID8 == productID8)
+ //{
+ // isCheck[5] = 1;
+
+ // #region 判断关键零件是否都校验
+
+ // if (isCheck[0] == 0)
+ // {
+ // MessageBox.Show("关键零件号1未校验！");
+ // textBox6.Text = "";
+ // textBox1.SelectAll();
+ // textBox1.Focus();
+ // return;
+ // }
+ // if (isCheck[1] == 0)
+ // {
+ // MessageBox.Show("关键零件号2未校验！");
+ // textBox6.Text = "";
+ // textBox2.SelectAll();
+ // textBox2.Focus();
+ // return;
+ // }
+ // if (isCheck[2] == 0)
+ // {
+ // MessageBox.Show("关键零件号3未校验！");
+ // textBox6.Text = "";
+ // textBox3.SelectAll();
+ // textBox3.Focus();
+ // return;
+ // }
+ // if (isCheck[3] == 0)
+ // {
+ // MessageBox.Show("关键零件号4未校验！");
+ // textBox6.Text = "";
+ // textBox4.SelectAll();
+ // textBox4.Focus();
+ // return;
+ // }
+ // if (isCheck[4] == 0)
+ // {
+ // MessageBox.Show("关键零件号5未校验！");
+ // textBox6.Text = "";
+ // textBox5.SelectAll();
+ // textBox5.Focus();
+ // return;
+ // }
+ // if (isCheck[5] == 0)
+ // {
+ // MessageBox.Show("关键零件号6未校验！");
+ // textBox6.SelectAll();
+ // textBox6.Focus();
+ // return;
+ // }
+
+ // #endregion
+
+ // ScanAll.ScanResult = true;
+ // ScanAll.barCode1 = textBox1.Text.Trim();
+ // ScanAll.partNo1 = Function2.GetPartNoByID(productID3);
+ // ScanAll.barCode2 = textBox2.Text.Trim();
+ // ScanAll.partNo2 = Function2.GetPartNoByID(productID4);
+ // ScanAll.barCode3 = textBox3.Text.Trim();
+ // ScanAll.partNo3 = Function2.GetPartNoByID(productID5);
+
+ // ScanAll.barCode4 = textBox4.Text.Trim();
+ // ScanAll.partNo4 = Function2.GetPartNoByID(productID6);
+ // ScanAll.barCode5 = textBox5.Text.Trim();
+ // ScanAll.partNo5 = Function2.GetPartNoByID(productID7);
+ // ScanAll.barCode6 = textBox6.Text.Trim();
+ // ScanAll.partNo6 = Function2.GetPartNoByID(productID8);
+ // this.Close();
+ //}
+ //else
+ //{
+ // MessageBox.Show("扫入条码与总成不匹配，请检查后再次扫描");
+ // textBox4.Text = "";
+ //}
}
}
}
diff --git a/PunchingMistake/FrmQualityNew.Designer.cs b/PunchingMistake/FrmQualityNew.Designer.cs
index f7529ee..06a2a2b 100644
--- a/PunchingMistake/FrmQualityNew.Designer.cs
+++ b/PunchingMistake/FrmQualityNew.Designer.cs
@@ -35,6 +35,7 @@
///
private void InitializeComponent()
{
+ this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmQualityNew));
this.labTime = new System.Windows.Forms.Label();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
@@ -47,55 +48,32 @@
this.txtBarCode = new System.Windows.Forms.TextBox();
this.labProPosition = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel();
- this.button4 = new System.Windows.Forms.Button();
- this.button3 = new System.Windows.Forms.Button();
- this.btnPlanDown = new System.Windows.Forms.Button();
- this.btnPlanUp = new System.Windows.Forms.Button();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.panelResponsibility = new System.Windows.Forms.Panel();
+ this.label19 = new System.Windows.Forms.Label();
+ this.label3 = new System.Windows.Forms.Label();
+ this.label17 = new System.Windows.Forms.Label();
+ this.lbForeig = new System.Windows.Forms.Label();
this.btnOk = new System.Windows.Forms.Button();
this.btnRepair = new System.Windows.Forms.Button();
- this.btnNok = new System.Windows.Forms.Button();
this.btnAbt = new System.Windows.Forms.Button();
- this.lableFP = new System.Windows.Forms.Label();
- this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.lbProductName = new System.Windows.Forms.Label();
- this.lbProductCode = new System.Windows.Forms.Label();
- this.label10 = new System.Windows.Forms.Label();
- this.label9 = new System.Windows.Forms.Label();
- this.label8 = new System.Windows.Forms.Label();
- this.lbPlanCode = new System.Windows.Forms.Label();
- this.groupBox2 = new System.Windows.Forms.GroupBox();
- this.lbPlanQty = new System.Windows.Forms.Label();
- this.groupBox3 = new System.Windows.Forms.GroupBox();
- this.lbPlanCompleteQty = new System.Windows.Forms.Label();
- this.groupBox4 = new System.Windows.Forms.GroupBox();
- this.lbOkCount = new System.Windows.Forms.Label();
- this.groupBox5 = new System.Windows.Forms.GroupBox();
- this.lbRepairCount = new System.Windows.Forms.Label();
- this.groupBox6 = new System.Windows.Forms.GroupBox();
- this.lbBadCount = new System.Windows.Forms.Label();
- this.lbForeig = new System.Windows.Forms.Label();
- this.labWorkClass = new System.Windows.Forms.Label();
- this.labStation = new System.Windows.Forms.Label();
- this.labelVersion = new System.Windows.Forms.Label();
+ this.btnPG = new System.Windows.Forms.Button();
+ this.timer1 = new System.Windows.Forms.Timer(this.components);
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
this.panel1.SuspendLayout();
this.groupBox1.SuspendLayout();
- this.groupBox2.SuspendLayout();
- this.groupBox3.SuspendLayout();
- this.groupBox4.SuspendLayout();
- this.groupBox5.SuspendLayout();
- this.groupBox6.SuspendLayout();
+ this.panelResponsibility.SuspendLayout();
this.SuspendLayout();
//
// labTime
//
this.labTime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.labTime.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.labTime.Location = new System.Drawing.Point(1867, 17);
- this.labTime.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.labTime.Location = new System.Drawing.Point(2037, 19);
+ this.labTime.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.labTime.Name = "labTime";
- this.labTime.Size = new System.Drawing.Size(457, 146);
+ this.labTime.Size = new System.Drawing.Size(498, 167);
this.labTime.TabIndex = 18;
this.labTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.labTime.Click += new System.EventHandler(this.labTime_Click);
@@ -104,10 +82,10 @@
//
this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
- this.pictureBox1.Location = new System.Drawing.Point(22, 17);
- this.pictureBox1.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.pictureBox1.Location = new System.Drawing.Point(24, 19);
+ this.pictureBox1.Margin = new System.Windows.Forms.Padding(7, 5, 7, 5);
this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(291, 146);
+ this.pictureBox1.Size = new System.Drawing.Size(317, 167);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox1.TabIndex = 17;
this.pictureBox1.TabStop = false;
@@ -116,27 +94,27 @@
//
this.labTitle.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.labTitle.Font = new System.Drawing.Font("宋体", 48F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.labTitle.Location = new System.Drawing.Point(296, 17);
- this.labTitle.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.labTitle.Location = new System.Drawing.Point(323, 19);
+ this.labTitle.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.labTitle.Name = "labTitle";
- this.labTitle.Size = new System.Drawing.Size(1576, 146);
+ this.labTitle.Size = new System.Drawing.Size(1719, 167);
this.labTitle.TabIndex = 16;
this.labTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// panel2
//
- this.panel2.Location = new System.Drawing.Point(18, 870);
- this.panel2.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel2.Location = new System.Drawing.Point(24, 1232);
+ this.panel2.Margin = new System.Windows.Forms.Padding(7, 5, 7, 5);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(1829, 578);
+ this.panel2.Size = new System.Drawing.Size(1995, 701);
this.panel2.TabIndex = 48;
//
// pictureBox2
//
- this.pictureBox2.Location = new System.Drawing.Point(18, 352);
- this.pictureBox2.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.pictureBox2.Location = new System.Drawing.Point(24, 601);
+ this.pictureBox2.Margin = new System.Windows.Forms.Padding(7, 5, 7, 5);
this.pictureBox2.Name = "pictureBox2";
- this.pictureBox2.Size = new System.Drawing.Size(1829, 509);
+ this.pictureBox2.Size = new System.Drawing.Size(1995, 584);
this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox2.TabIndex = 47;
this.pictureBox2.TabStop = false;
@@ -145,10 +123,10 @@
//
this.label15.BackColor = System.Drawing.Color.Lime;
this.label15.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label15.Location = new System.Drawing.Point(21, 163);
- this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label15.Location = new System.Drawing.Point(24, 202);
+ this.label15.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(292, 130);
+ this.label15.Size = new System.Drawing.Size(319, 149);
this.label15.TabIndex = 49;
this.label15.Text = "扫码信息";
this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -157,10 +135,10 @@
//
this.labProductInfo.BackColor = System.Drawing.Color.White;
this.labProductInfo.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.labProductInfo.Location = new System.Drawing.Point(1407, 163);
- this.labProductInfo.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.labProductInfo.Location = new System.Drawing.Point(1536, 202);
+ this.labProductInfo.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.labProductInfo.Name = "labProductInfo";
- this.labProductInfo.Size = new System.Drawing.Size(917, 130);
+ this.labProductInfo.Size = new System.Drawing.Size(1000, 149);
this.labProductInfo.TabIndex = 52;
this.labProductInfo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
@@ -168,10 +146,10 @@
//
this.label2.BackColor = System.Drawing.Color.Lime;
this.label2.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label2.Location = new System.Drawing.Point(1106, 163);
- this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label2.Location = new System.Drawing.Point(1207, 202);
+ this.label2.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(292, 130);
+ this.label2.Size = new System.Drawing.Size(319, 149);
this.label2.TabIndex = 51;
this.label2.Text = "产品信息";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -180,10 +158,10 @@
//
this.txtBarCode.BackColor = System.Drawing.Color.White;
this.txtBarCode.Font = new System.Drawing.Font("黑体", 30F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.txtBarCode.Location = new System.Drawing.Point(325, 184);
- this.txtBarCode.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.txtBarCode.Location = new System.Drawing.Point(356, 226);
+ this.txtBarCode.Margin = new System.Windows.Forms.Padding(7, 5, 7, 5);
this.txtBarCode.Name = "txtBarCode";
- this.txtBarCode.Size = new System.Drawing.Size(764, 87);
+ this.txtBarCode.Size = new System.Drawing.Size(833, 99);
this.txtBarCode.TabIndex = 0;
this.txtBarCode.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.txtBarCode.DoubleClick += new System.EventHandler(this.txtBarCode_DoubleClick);
@@ -193,84 +171,118 @@
//
this.labProPosition.BackColor = System.Drawing.Color.White;
this.labProPosition.Font = new System.Drawing.Font("黑体", 22F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.labProPosition.Location = new System.Drawing.Point(1870, 315);
- this.labProPosition.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.labProPosition.Location = new System.Drawing.Point(2029, 369);
+ this.labProPosition.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.labProPosition.Name = "labProPosition";
- this.labProPosition.Size = new System.Drawing.Size(465, 151);
+ this.labProPosition.Size = new System.Drawing.Size(507, 173);
this.labProPosition.TabIndex = 64;
this.labProPosition.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// panel1
//
this.panel1.AutoScroll = true;
- this.panel1.Controls.Add(this.button4);
- this.panel1.Controls.Add(this.button3);
- this.panel1.Controls.Add(this.btnPlanDown);
- this.panel1.Controls.Add(this.btnPlanUp);
- this.panel1.Controls.Add(this.btnOk);
- this.panel1.Controls.Add(this.btnRepair);
- this.panel1.Controls.Add(this.btnNok);
- this.panel1.Controls.Add(this.btnAbt);
+ this.panel1.Controls.Add(this.groupBox1);
this.panel1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.panel1.Location = new System.Drawing.Point(18, 1469);
- this.panel1.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel1.Location = new System.Drawing.Point(24, 350);
+ this.panel1.Margin = new System.Windows.Forms.Padding(7, 5, 7, 5);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1829, 317);
+ this.panel1.Size = new System.Drawing.Size(1995, 243);
this.panel1.TabIndex = 66;
//
- // button4
- //
- this.button4.BackColor = System.Drawing.Color.Red;
- this.button4.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button4.Location = new System.Drawing.Point(1275, 181);
- this.button4.Name = "button4";
- this.button4.Size = new System.Drawing.Size(326, 90);
- this.button4.TabIndex = 74;
- this.button4.Text = "结束计划";
- this.button4.UseVisualStyleBackColor = false;
- //
- // button3
- //
- this.button3.BackColor = System.Drawing.Color.LawnGreen;
- this.button3.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button3.Location = new System.Drawing.Point(1275, 45);
- this.button3.Name = "button3";
- this.button3.Size = new System.Drawing.Size(326, 90);
- this.button3.TabIndex = 73;
- this.button3.Text = "计划查询";
- this.button3.UseVisualStyleBackColor = false;
- //
- // btnPlanDown
- //
- this.btnPlanDown.BackColor = System.Drawing.Color.LawnGreen;
- this.btnPlanDown.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnPlanDown.Location = new System.Drawing.Point(852, 181);
- this.btnPlanDown.Name = "btnPlanDown";
- this.btnPlanDown.Size = new System.Drawing.Size(326, 81);
- this.btnPlanDown.TabIndex = 72;
- this.btnPlanDown.Text = "下一计划";
- this.btnPlanDown.UseVisualStyleBackColor = false;
- this.btnPlanDown.Click += new System.EventHandler(this.btnPlanDown_Click);
- //
- // btnPlanUp
- //
- this.btnPlanUp.BackColor = System.Drawing.Color.LawnGreen;
- this.btnPlanUp.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnPlanUp.Location = new System.Drawing.Point(852, 45);
- this.btnPlanUp.Name = "btnPlanUp";
- this.btnPlanUp.Size = new System.Drawing.Size(326, 90);
- this.btnPlanUp.TabIndex = 71;
- this.btnPlanUp.Text = "上一计划";
- this.btnPlanUp.UseVisualStyleBackColor = false;
- this.btnPlanUp.Click += new System.EventHandler(this.btnPlanUp_Click);
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.panelResponsibility);
+ this.groupBox1.Controls.Add(this.lbForeig);
+ this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.groupBox1.Location = new System.Drawing.Point(0, 0);
+ this.groupBox1.Margin = new System.Windows.Forms.Padding(0);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Padding = new System.Windows.Forms.Padding(0);
+ this.groupBox1.Size = new System.Drawing.Size(1995, 243);
+ this.groupBox1.TabIndex = 0;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "责任部门";
+ //
+ // panelResponsibility
+ //
+ this.panelResponsibility.AutoScroll = true;
+ this.panelResponsibility.Controls.Add(this.label19);
+ this.panelResponsibility.Controls.Add(this.label3);
+ this.panelResponsibility.Controls.Add(this.label17);
+ this.panelResponsibility.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panelResponsibility.Location = new System.Drawing.Point(0, 43);
+ this.panelResponsibility.Margin = new System.Windows.Forms.Padding(0);
+ this.panelResponsibility.Name = "panelResponsibility";
+ this.panelResponsibility.Size = new System.Drawing.Size(1995, 130);
+ this.panelResponsibility.TabIndex = 0;
+ this.panelResponsibility.Paint += new System.Windows.Forms.PaintEventHandler(this.panelResponsibility_Paint);
+ //
+ // label19
+ //
+ this.label19.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.label19.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label19.ForeColor = System.Drawing.Color.Blue;
+ this.label19.Location = new System.Drawing.Point(980, 9);
+ this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label19.Name = "label19";
+ this.label19.Size = new System.Drawing.Size(375, 105);
+ this.label19.TabIndex = 12;
+ this.label19.Tag = "Response";
+ this.label19.Text = "物流";
+ this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.label19.Click += new System.EventHandler(this.Responsibility_Click);
+ //
+ // label3
+ //
+ this.label3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.label3.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label3.ForeColor = System.Drawing.Color.Blue;
+ this.label3.Location = new System.Drawing.Point(515, 9);
+ this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(321, 105);
+ this.label3.TabIndex = 11;
+ this.label3.Tag = "Response";
+ this.label3.Text = "注塑";
+ this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.label3.Click += new System.EventHandler(this.Responsibility_Click);
+ //
+ // label17
+ //
+ this.label17.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.label17.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label17.ForeColor = System.Drawing.Color.Blue;
+ this.label17.Location = new System.Drawing.Point(9, 9);
+ this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label17.Name = "label17";
+ this.label17.Size = new System.Drawing.Size(361, 105);
+ this.label17.TabIndex = 10;
+ this.label17.Tag = "Response";
+ this.label17.Text = "喷涂";
+ this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.label17.Click += new System.EventHandler(this.Responsibility_Click);
+ //
+ // lbForeig
+ //
+ this.lbForeig.AutoSize = true;
+ this.lbForeig.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbForeig.ForeColor = System.Drawing.Color.Red;
+ this.lbForeig.Location = new System.Drawing.Point(3, 192);
+ this.lbForeig.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbForeig.Name = "lbForeig";
+ this.lbForeig.Size = new System.Drawing.Size(72, 28);
+ this.lbForeig.TabIndex = 72;
+ this.lbForeig.Tag = "老外库提示";
+ this.lbForeig.Text = " ";
//
// btnOk
//
this.btnOk.BackColor = System.Drawing.Color.LawnGreen;
this.btnOk.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnOk.Location = new System.Drawing.Point(30, 45);
+ this.btnOk.Location = new System.Drawing.Point(2029, 747);
this.btnOk.Name = "btnOk";
- this.btnOk.Size = new System.Drawing.Size(326, 90);
+ this.btnOk.Size = new System.Drawing.Size(536, 225);
this.btnOk.TabIndex = 67;
this.btnOk.Text = "合 格";
this.btnOk.UseVisualStyleBackColor = false;
@@ -280,300 +292,52 @@
//
this.btnRepair.BackColor = System.Drawing.Color.DodgerBlue;
this.btnRepair.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnRepair.Location = new System.Drawing.Point(30, 181);
+ this.btnRepair.Location = new System.Drawing.Point(2029, 1081);
this.btnRepair.Name = "btnRepair";
- this.btnRepair.Size = new System.Drawing.Size(326, 90);
+ this.btnRepair.Size = new System.Drawing.Size(536, 225);
this.btnRepair.TabIndex = 69;
this.btnRepair.Text = "返修";
this.btnRepair.UseVisualStyleBackColor = false;
this.btnRepair.Click += new System.EventHandler(this.btnRepair_Click);
//
- // btnNok
- //
- this.btnNok.BackColor = System.Drawing.Color.Yellow;
- this.btnNok.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnNok.Location = new System.Drawing.Point(466, 45);
- this.btnNok.Name = "btnNok";
- this.btnNok.Size = new System.Drawing.Size(321, 90);
- this.btnNok.TabIndex = 68;
- this.btnNok.Text = "返修合格";
- this.btnNok.UseVisualStyleBackColor = false;
- this.btnNok.Click += new System.EventHandler(this.btnNok_Click);
- //
// btnAbt
//
this.btnAbt.BackColor = System.Drawing.Color.OrangeRed;
this.btnAbt.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnAbt.Location = new System.Drawing.Point(466, 181);
+ this.btnAbt.Location = new System.Drawing.Point(2029, 1715);
this.btnAbt.Name = "btnAbt";
- this.btnAbt.Size = new System.Drawing.Size(314, 90);
+ this.btnAbt.Size = new System.Drawing.Size(536, 217);
this.btnAbt.TabIndex = 70;
this.btnAbt.Text = "报 废";
this.btnAbt.UseVisualStyleBackColor = false;
this.btnAbt.Click += new System.EventHandler(this.btnAbt_Click);
//
- // lableFP
- //
- this.lableFP.AutoSize = true;
- this.lableFP.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lableFP.ForeColor = System.Drawing.Color.Red;
- this.lableFP.Location = new System.Drawing.Point(2201, 552);
- this.lableFP.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.lableFP.Name = "lableFP";
- this.lableFP.Size = new System.Drawing.Size(106, 42);
- this.lableFP.TabIndex = 71;
- this.lableFP.Tag = "存在返喷";
- this.lableFP.Text = " ";
+ // btnPG
//
- // groupBox1
- //
- this.groupBox1.Controls.Add(this.lbProductName);
- this.groupBox1.Controls.Add(this.lbProductCode);
- this.groupBox1.Controls.Add(this.label10);
- this.groupBox1.Controls.Add(this.label9);
- this.groupBox1.Controls.Add(this.label8);
- this.groupBox1.Controls.Add(this.lbPlanCode);
- this.groupBox1.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.groupBox1.ForeColor = System.Drawing.Color.Blue;
- this.groupBox1.Location = new System.Drawing.Point(1879, 604);
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(456, 192);
- this.groupBox1.TabIndex = 72;
- this.groupBox1.TabStop = false;
- this.groupBox1.Text = "当前计划";
- //
- // lbProductName
- //
- this.lbProductName.AutoSize = true;
- this.lbProductName.ForeColor = System.Drawing.Color.Black;
- this.lbProductName.Location = new System.Drawing.Point(114, 156);
- this.lbProductName.Name = "lbProductName";
- this.lbProductName.Size = new System.Drawing.Size(105, 33);
- this.lbProductName.TabIndex = 5;
- this.lbProductName.Text = " ";
- //
- // lbProductCode
- //
- this.lbProductCode.AutoSize = true;
- this.lbProductCode.ForeColor = System.Drawing.Color.Black;
- this.lbProductCode.Location = new System.Drawing.Point(114, 105);
- this.lbProductCode.Name = "lbProductCode";
- this.lbProductCode.Size = new System.Drawing.Size(87, 33);
- this.lbProductCode.TabIndex = 4;
- this.lbProductCode.Text = " ";
- //
- // label10
- //
- this.label10.AutoSize = true;
- this.label10.ForeColor = System.Drawing.Color.Black;
- this.label10.Location = new System.Drawing.Point(17, 156);
- this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(83, 33);
- this.label10.TabIndex = 3;
- this.label10.Text = "描述";
- //
- // label9
- //
- this.label9.AutoSize = true;
- this.label9.ForeColor = System.Drawing.Color.Black;
- this.label9.Location = new System.Drawing.Point(16, 105);
- this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(83, 33);
- this.label9.TabIndex = 2;
- this.label9.Text = "产品";
- //
- // label8
- //
- this.label8.AutoSize = true;
- this.label8.ForeColor = System.Drawing.Color.Black;
- this.label8.Location = new System.Drawing.Point(16, 55);
- this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(83, 33);
- this.label8.TabIndex = 1;
- this.label8.Text = "编号";
- //
- // lbPlanCode
- //
- this.lbPlanCode.AutoSize = true;
- this.lbPlanCode.ForeColor = System.Drawing.Color.Black;
- this.lbPlanCode.Location = new System.Drawing.Point(114, 55);
- this.lbPlanCode.Name = "lbPlanCode";
- this.lbPlanCode.Size = new System.Drawing.Size(87, 33);
- this.lbPlanCode.TabIndex = 0;
- this.lbPlanCode.Text = " ";
- //
- // groupBox2
- //
- this.groupBox2.Controls.Add(this.lbPlanQty);
- this.groupBox2.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.groupBox2.ForeColor = System.Drawing.Color.Blue;
- this.groupBox2.Location = new System.Drawing.Point(1879, 821);
- this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(456, 138);
- this.groupBox2.TabIndex = 73;
- this.groupBox2.TabStop = false;
- this.groupBox2.Text = "生产计划数量";
- //
- // lbPlanQty
- //
- this.lbPlanQty.AutoSize = true;
- this.lbPlanQty.Font = new System.Drawing.Font("宋体", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lbPlanQty.ForeColor = System.Drawing.Color.Black;
- this.lbPlanQty.Location = new System.Drawing.Point(41, 40);
- this.lbPlanQty.Name = "lbPlanQty";
- this.lbPlanQty.Size = new System.Drawing.Size(78, 84);
- this.lbPlanQty.TabIndex = 1;
- this.lbPlanQty.Text = "0";
- //
- // groupBox3
- //
- this.groupBox3.Controls.Add(this.lbPlanCompleteQty);
- this.groupBox3.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.groupBox3.ForeColor = System.Drawing.Color.Blue;
- this.groupBox3.Location = new System.Drawing.Point(1885, 983);
- this.groupBox3.Name = "groupBox3";
- this.groupBox3.Size = new System.Drawing.Size(456, 138);
- this.groupBox3.TabIndex = 74;
- this.groupBox3.TabStop = false;
- this.groupBox3.Text = "计划完成数量";
- //
- // lbPlanCompleteQty
- //
- this.lbPlanCompleteQty.AutoSize = true;
- this.lbPlanCompleteQty.Font = new System.Drawing.Font("宋体", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lbPlanCompleteQty.ForeColor = System.Drawing.Color.Black;
- this.lbPlanCompleteQty.Location = new System.Drawing.Point(36, 40);
- this.lbPlanCompleteQty.Name = "lbPlanCompleteQty";
- this.lbPlanCompleteQty.Size = new System.Drawing.Size(78, 84);
- this.lbPlanCompleteQty.TabIndex = 0;
- this.lbPlanCompleteQty.Text = "0";
- //
- // groupBox4
- //
- this.groupBox4.Controls.Add(this.lbOkCount);
- this.groupBox4.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.groupBox4.ForeColor = System.Drawing.Color.Blue;
- this.groupBox4.Location = new System.Drawing.Point(1885, 1153);
- this.groupBox4.Name = "groupBox4";
- this.groupBox4.Size = new System.Drawing.Size(456, 138);
- this.groupBox4.TabIndex = 75;
- this.groupBox4.TabStop = false;
- this.groupBox4.Text = "合格数量";
- //
- // lbOkCount
- //
- this.lbOkCount.AutoSize = true;
- this.lbOkCount.Font = new System.Drawing.Font("宋体", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lbOkCount.ForeColor = System.Drawing.Color.Black;
- this.lbOkCount.Location = new System.Drawing.Point(36, 40);
- this.lbOkCount.Name = "lbOkCount";
- this.lbOkCount.Size = new System.Drawing.Size(78, 84);
- this.lbOkCount.TabIndex = 1;
- this.lbOkCount.Text = "0";
- //
- // groupBox5
- //
- this.groupBox5.Controls.Add(this.lbRepairCount);
- this.groupBox5.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.groupBox5.ForeColor = System.Drawing.Color.Blue;
- this.groupBox5.Location = new System.Drawing.Point(1885, 1324);
- this.groupBox5.Name = "groupBox5";
- this.groupBox5.Size = new System.Drawing.Size(456, 138);
- this.groupBox5.TabIndex = 76;
- this.groupBox5.TabStop = false;
- this.groupBox5.Text = "返修数量";
- //
- // lbRepairCount
- //
- this.lbRepairCount.AutoSize = true;
- this.lbRepairCount.Font = new System.Drawing.Font("宋体", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lbRepairCount.ForeColor = System.Drawing.Color.Black;
- this.lbRepairCount.Location = new System.Drawing.Point(36, 40);
- this.lbRepairCount.Name = "lbRepairCount";
- this.lbRepairCount.Size = new System.Drawing.Size(78, 84);
- this.lbRepairCount.TabIndex = 1;
- this.lbRepairCount.Text = "0";
- //
- // groupBox6
- //
- this.groupBox6.Controls.Add(this.lbBadCount);
- this.groupBox6.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.groupBox6.ForeColor = System.Drawing.Color.Blue;
- this.groupBox6.Location = new System.Drawing.Point(1885, 1494);
- this.groupBox6.Name = "groupBox6";
- this.groupBox6.Size = new System.Drawing.Size(456, 138);
- this.groupBox6.TabIndex = 77;
- this.groupBox6.TabStop = false;
- this.groupBox6.Text = "报废数量";
- //
- // lbBadCount
- //
- this.lbBadCount.AutoSize = true;
- this.lbBadCount.Font = new System.Drawing.Font("宋体", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lbBadCount.ForeColor = System.Drawing.Color.Black;
- this.lbBadCount.Location = new System.Drawing.Point(36, 40);
- this.lbBadCount.Name = "lbBadCount";
- this.lbBadCount.Size = new System.Drawing.Size(78, 84);
- this.lbBadCount.TabIndex = 1;
- this.lbBadCount.Text = "0";
+ this.btnPG.BackColor = System.Drawing.Color.Yellow;
+ this.btnPG.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnPG.Location = new System.Drawing.Point(2029, 1401);
+ this.btnPG.Name = "btnPG";
+ this.btnPG.Size = new System.Drawing.Size(536, 225);
+ this.btnPG.TabIndex = 73;
+ this.btnPG.Text = "返修合格";
+ this.btnPG.UseVisualStyleBackColor = false;
+ this.btnPG.Click += new System.EventHandler(this.btnPG_Click);
//
- // lbForeig
+ // timer1
//
- this.lbForeig.AutoSize = true;
- this.lbForeig.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lbForeig.Location = new System.Drawing.Point(26, 306);
- this.lbForeig.Name = "lbForeig";
- this.lbForeig.Size = new System.Drawing.Size(69, 33);
- this.lbForeig.TabIndex = 78;
- this.lbForeig.Text = " ";
- //
- // labWorkClass
- //
- this.labWorkClass.AutoSize = true;
- this.labWorkClass.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.labWorkClass.Location = new System.Drawing.Point(1879, 487);
- this.labWorkClass.Name = "labWorkClass";
- this.labWorkClass.Size = new System.Drawing.Size(67, 33);
- this.labWorkClass.TabIndex = 79;
- this.labWorkClass.Text = "A班";
- //
- // labStation
- //
- this.labStation.AutoSize = true;
- this.labStation.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.labStation.Location = new System.Drawing.Point(2123, 487);
- this.labStation.Name = "labStation";
- this.labStation.Size = new System.Drawing.Size(69, 33);
- this.labStation.TabIndex = 80;
- this.labStation.Text = "F02";
- //
- // labelVersion
- //
- this.labelVersion.AutoSize = true;
- this.labelVersion.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.labelVersion.Location = new System.Drawing.Point(1879, 552);
- this.labelVersion.Name = "labelVersion";
- this.labelVersion.Size = new System.Drawing.Size(159, 33);
- this.labelVersion.TabIndex = 81;
- this.labelVersion.Text = "10.0.0.1";
+ this.timer1.Interval = 1000;
//
// FrmQualityNew
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(2351, 1789);
- this.Controls.Add(this.labelVersion);
- this.Controls.Add(this.labStation);
- this.Controls.Add(this.labWorkClass);
- this.Controls.Add(this.lbForeig);
- this.Controls.Add(this.groupBox6);
- this.Controls.Add(this.groupBox5);
- this.Controls.Add(this.groupBox4);
- this.Controls.Add(this.groupBox3);
- this.Controls.Add(this.groupBox2);
- this.Controls.Add(this.groupBox1);
+ this.ClientSize = new System.Drawing.Size(2565, 2045);
+ this.Controls.Add(this.btnPG);
+ this.Controls.Add(this.btnAbt);
+ this.Controls.Add(this.btnRepair);
+ this.Controls.Add(this.btnOk);
this.Controls.Add(this.panel1);
- this.Controls.Add(this.lableFP);
this.Controls.Add(this.labProPosition);
this.Controls.Add(this.txtBarCode);
this.Controls.Add(this.labProductInfo);
@@ -585,7 +349,7 @@
this.Controls.Add(this.pictureBox1);
this.Controls.Add(this.labTitle);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
- this.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.Margin = new System.Windows.Forms.Padding(7, 5, 7, 5);
this.Name = "FrmQualityNew";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "喷涂质检";
@@ -595,16 +359,7 @@
this.panel1.ResumeLayout(false);
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
- this.groupBox2.ResumeLayout(false);
- this.groupBox2.PerformLayout();
- this.groupBox3.ResumeLayout(false);
- this.groupBox3.PerformLayout();
- this.groupBox4.ResumeLayout(false);
- this.groupBox4.PerformLayout();
- this.groupBox5.ResumeLayout(false);
- this.groupBox5.PerformLayout();
- this.groupBox6.ResumeLayout(false);
- this.groupBox6.PerformLayout();
+ this.panelResponsibility.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
@@ -622,35 +377,16 @@
private System.Windows.Forms.TextBox txtBarCode;
private System.Windows.Forms.Label labProPosition;
private System.Windows.Forms.Panel panel1;
+ private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.Button btnOk;
- private System.Windows.Forms.Button btnNok;
private System.Windows.Forms.Button btnRepair;
private System.Windows.Forms.Button btnAbt;
- private System.Windows.Forms.Label lableFP;
- private System.Windows.Forms.Button btnPlanDown;
- private System.Windows.Forms.Button btnPlanUp;
- private System.Windows.Forms.Button button4;
- private System.Windows.Forms.Button button3;
- private System.Windows.Forms.GroupBox groupBox1;
- private System.Windows.Forms.GroupBox groupBox2;
- private System.Windows.Forms.GroupBox groupBox3;
- private System.Windows.Forms.GroupBox groupBox4;
- private System.Windows.Forms.GroupBox groupBox5;
- private System.Windows.Forms.GroupBox groupBox6;
+ private System.Windows.Forms.Panel panelResponsibility;
private System.Windows.Forms.Label lbForeig;
- private System.Windows.Forms.Label labWorkClass;
- private System.Windows.Forms.Label labStation;
- private System.Windows.Forms.Label labelVersion;
- private System.Windows.Forms.Label lbPlanCode;
- private System.Windows.Forms.Label lbPlanCompleteQty;
- private System.Windows.Forms.Label lbOkCount;
- private System.Windows.Forms.Label lbRepairCount;
- private System.Windows.Forms.Label lbBadCount;
- private System.Windows.Forms.Label lbPlanQty;
- private System.Windows.Forms.Label label8;
- private System.Windows.Forms.Label label10;
- private System.Windows.Forms.Label label9;
- private System.Windows.Forms.Label lbProductName;
- private System.Windows.Forms.Label lbProductCode;
+ private System.Windows.Forms.Label label19;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.Label label17;
+ private System.Windows.Forms.Button btnPG;
+ private System.Windows.Forms.Timer timer1;
}
}
\ No newline at end of file
diff --git a/PunchingMistake/FrmQualityNew.cs b/PunchingMistake/FrmQualityNew.cs
index 5c062c4..6e61d12 100644
--- a/PunchingMistake/FrmQualityNew.cs
+++ b/PunchingMistake/FrmQualityNew.cs
@@ -14,57 +14,47 @@ using System.Threading;
using System.Windows.Forms;
using MESClassLibrary.BLL.BasicInfo;
using static System.Windows.Forms.AxHost;
-using PaintingPC;
+using PunchingMistake;
namespace PunchingMistake
{
public partial class FrmQualityNew : Form
{
- int count = 0; //缺陷图选择个数
- public static string ColorName = ""; //修改颜色
+ int count = 0; //缺陷图选择个数
public static string paintId = "";
- private static string position = "", reason = "";
+ private static string position = "", reason = "", responsible = "";
- private string _carType = string.Empty;
- private Dictionary _lastJustDict = new Dictionary();
- private string _foreighColor = string.Empty;
- private string _lineCode = string.Empty;
- private List _stations = new List();
-
- private StationBLL _stationBLL = new StationBLL();
- ///
- /// 从tb_ForeignColorMap表得到的零件号
- ///
- private string _foreignPartCode = string.Empty;
- private bool _isSingleStation = false;
- private string _isTest = "false";
- private string _stationNo = "";
- private string IsHigh = "1";
+ private string _stationType = "上线前质检";
+ private string _isTest = "false";
+ //责任方
+ private List _selectResponsibles = new List();
+ //扫描的喷涂行数据
+ private DataRow _scanPaintRow = null;
public FrmQualityNew()
{
InitializeComponent();
//WindowState = FormWindowState.Normal;
this.Size = new Size(1280, 1020);
-
-
+ _isTest = ConfigurationManager.AppSettings["测试"]?.ToString();
+ labProPosition.Text = Program.station;
}
-
-
private void FrmSecondCheck_Load(object sender, EventArgs e)
{
try
{
Control.CheckForIllegalCrossThreadCalls = false;
+ UpdateSoftware();
InitPage();
}
catch (Exception ex)
{
MessageBox.Show("网络故障，请联系网络管理员");
- LogHelper.WriteLog(ex.ToString(), MethodBase.GetCurrentMethod().Name);
+ LogHelper.WriteLog(ex.ToString());
+ // LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name);
}
}
@@ -72,27 +62,22 @@ namespace PunchingMistake
{
try
{
- string title = ConfigurationManager.AppSettings["Display"].ToString();
- string workClass = Function.GetWorkClass2();
- _stationNo = ConfigurationManager.AppSettings["Station"].ToString();
-
- labTitle.Text = title;
-
- labWorkClass.Text = workClass;
- labStation.Text = _stationNo;
- labelVersion.Text = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
-
- LoadScreen();
+ string title = ConfigurationManager.AppSettings["Display"].ToString(); ;
+ string workClass = Function3.GetWorkClass();
+ string station = ConfigurationManager.AppSettings["Station"].ToString();
+ labTitle.Text = title;
+ //Program.IP = ConfigurationManager.AppSettings["IP"].ToString();
+
Thread t = new Thread(new ThreadStart(TimeGo));
t.Start();
}
catch (Exception ex)
- { }
+ {
+ }
}
-
-
+
private void TimeGo()
{
@@ -135,6 +120,11 @@ namespace PunchingMistake
a.BackColor = Color.Transparent;
count--;
}
+
+ if(!string.IsNullOrEmpty(position) && position.EndsWith(";"))
+ {
+ position = position.Substring(0, position.Length - 1);
+ }
}
///
@@ -165,7 +155,6 @@ namespace PunchingMistake
private Control[] SetControlGroup()
{
- //Control[] controls = { btnPass, btnAbt, btnRepair };
Control[] controls = { };
return controls;
}
@@ -182,17 +171,7 @@ namespace PunchingMistake
}
}
- bool SaveBeforeVerify( string currentRst)
- {
- string lastRst = GetLastInspectRst(txtBarCode.Text.Trim());
- if (lastRst.Contains("报废"))
- {
- MessageBox.Show($"条码已判定为报废，不能再判定为{currentRst}.");
- Clear();
- return false;
- }
- return true;
- }
+
///
/// 合格
///
@@ -202,87 +181,15 @@ namespace PunchingMistake
{
try
{
- if (string.IsNullOrEmpty(txtBarCode.Text.Trim()))
+ if (_scanPaintRow == null)
{
MessageBox.Show("请先扫描数据,然后操作.");
return;
}
- #region 返喷下线数据验证
- if (lableFP.Text.Contains("[返喷]"))
- {
- string barcode = txtBarCode.Text.Trim();
- DataTable dtInspect = Function.GetInspectInfoByBarCode2(barcode);
- if (dtInspect != null && dtInspect.Rows.Count > 0)
- {
- string inspectResult = dtInspect.Rows[0]["inspectResult"].ToString(); //检测结果
- string inspectColorInfo = dtInspect.Rows[0]["remark1"].ToString(); //颜色
- if (inspectResult.Contains("打磨"))
- {
- string createTime = dtInspect.Rows[0]["createTime"].ToString(); //创建时间
- int count = 0;
- string colorInfo = "";
- if (_lineCode == "2")
- {
- count = Function.GetProducColorFromWms(barcode, "TM_BJBMPT_MES_DATA", createTime ,ref colorInfo);
- }
- else if (_lineCode == "1")
- {
- count = Function.GetProducColorFromWms(barcode, "TM_BJBMPT_MES_DATA_OLD", createTime , ref colorInfo);
-
- }
- else
- {
-
- }
-
- if (count == 0)
- {
- MessageBox.Show("未发现返喷下线数据！，无法进行质量判定");
- return;
- }
- else
- {
- if(inspectColorInfo != colorInfo)
- {
- btnOk.Enabled = false;
- btnRepair.Enabled = false;
- btnNok.Enabled = false;
-
- MessageBox.Show("当前产品返喷颜色与原颜色不符，需报废！");
- return;
- }
-
- }
- }
- }
-
- }
- #endregion
-
- ShowHint("");
- #region 判断产品是否有颜色
- string colorName = string.Empty;
- string partName = string.Empty;
- if (CheckColor(ref colorName, ref partName) == false) return;
-
-
- #endregion
- ClearControlColor(SetControlGroup());
- btnAbt.BackColor = Color.Red;
-
- bool rr = SaveBeforeVerify("合格");
- if (rr == false)
- {
- return;
- }
-
- //if (lastRst.Contains("合格"))
- //{
- // MessageBox.Show("条码已判定为合格，无需重复判定");
- // Clear();
- // return;
- //}
- SaveRst("合格", colorName, partName, 1);
+
+ ShowHint("");
+
+ SaveRst("合格", _scanPaintRow);
}
catch(Exception ex)
{
@@ -298,190 +205,68 @@ namespace PunchingMistake
ClearTxtBarcode();
txtBarCode.TabIndex = 0;
}
-
+
+
///
- /// 其它
+ /// 点修补按钮
///
///
///
- private void btnNok_Click(object sender, EventArgs e)
+ private void btnRepair_Click(object sender, EventArgs e)
{
try
{
- if (string.IsNullOrEmpty(txtBarCode.Text.Trim()))
+ if (_scanPaintRow == null)
{
MessageBox.Show("请先扫描数据,然后操作.");
return;
}
- #region 返喷下线数据验证
- if (lableFP.Text.Contains("[返喷]"))
- {
- string barcode = txtBarCode.Text.Trim();
- DataTable dtInspect = Function.GetInspectInfoByBarCode2(barcode);
- if (dtInspect != null && dtInspect.Rows.Count > 0)
- {
- string inspectResult = dtInspect.Rows[0]["inspectResult"].ToString(); //检测结果
- string inspectColorInfo = dtInspect.Rows[0]["remark1"].ToString(); //颜色
- if (inspectResult.Contains("打磨"))
- {
- string createTime = dtInspect.Rows[0]["createTime"].ToString(); //创建时间
- int count = 0;
- string colorInfo = "";
- if (_lineCode == "2")
- {
- count = Function.GetProducColorFromWms(barcode, "TM_BJBMPT_MES_DATA", createTime, ref colorInfo);
- }
- else if (_lineCode == "1")
- {
- count = Function.GetProducColorFromWms(barcode, "TM_BJBMPT_MES_DATA_OLD", createTime, ref colorInfo);
-
- }
- else
- {
-
- }
-
- if (count == 0)
- {
- MessageBox.Show("未发现返喷下线数据！，无法进行质量判定");
- return;
- }
- else
- {
- if (inspectColorInfo != colorInfo)
- {
- btnOk.Enabled = false;
- btnRepair.Enabled = false;
- btnNok.Enabled = false;
-
- MessageBox.Show("当前产品返喷颜色与原颜色不符，需报废！");
- return;
- }
-
- }
- }
- }
-
- }
- #endregion
-
- if (MessageBox.Show($"确认对[{txtBarCode.Text}]进行[其它]判定?", "操作确认", MessageBoxButtons.OKCancel) == DialogResult.Cancel) return;
ShowHint("");
+
#region 必须选择缺陷位置与缺陷原因，否则无法保存
+
if (CheckDefect() == false) return;
- #endregion
- #region 判断产品是否有颜色
- string colorName = string.Empty;
- string partName = string.Empty;
- if (CheckColor(ref colorName, ref partName) == false) return;
#endregion
- int cs = Function.OtherTimes(txtBarCode.Text.Trim());
- if (cs > 0)
- {
- MessageBox.Show("条码" + txtBarCode.Text.Trim() + "已存在判定为其它的记录，只允许判定1次.");
- ShowHint("条码" + txtBarCode.Text.Trim() + "已存在判定为其它的记录，只允许判定1次.");
- Clear();
- return;
- }
+ btnRepair.BackColor = Color.Yellow;
- bool rr = SaveBeforeVerify("其它");
- if (rr == false)
- {
- return;
- }
- SaveRst("其它", colorName, partName, 4);
+ SaveRst("点修补", _scanPaintRow);
}
- catch(Exception ex)
+ catch (Exception ex)
{
- ShowHint("执行其它判定发生异常,异常原因:" + ex.Message);
- MessageBox.Show("执行其它判定发生异常,异常原因:" + ex.Message);
+ ShowHint("判定点修补操作发生异常,异常原因:" + ex.Message);
+ MessageBox.Show("判定点修补操作发生异常,异常原因:" + ex.Message);
Clear();
}
- }
- ///
- /// 返喷按钮
- ///
- ///
- ///
- private void btnRepair_Click(object sender, EventArgs e)
+ }
+ private void btnPG_Click(object sender, EventArgs e)
{
try
{
- #region 可回喷次数 =1，不能打磨， =2 可以， 不能有两次质检结果为打磨
- if (string.IsNullOrEmpty(txtBarCode.Text.Trim()))
+ if (_scanPaintRow == null)
{
MessageBox.Show("请先扫描数据,然后操作.");
return;
}
- if (MessageBox.Show($"确认对[{txtBarCode.Text}]进行返喷操作?", "操作确认", MessageBoxButtons.OKCancel) == DialogResult.Cancel) return;
ShowHint("");
- string barcode = Function.UniteBarCodeToOne(txtBarCode.Text.Trim());
- int cs = Function.YiDaMoCiShu(barcode); //记录中已返喷次数
-
- int keHuiPen = Function.keHuiPen(barcode); //基础数据中,可返喷次数
- if (keHuiPen > 1)
- keHuiPen = 1;
-
- if (keHuiPen > 0 && cs < keHuiPen)
- {
- #region 必须选择缺陷位置与缺陷原因，否则无法保存
-
- if (CheckDefect() == false) return;
-
- #endregion
-
- #region 判断产品是否有颜色
- string colorName = string.Empty;
- string partName = string.Empty;
-
- if (CheckColor(ref colorName, ref partName) == false) return;
- #endregion
-
- ClearControlColor(SetControlGroup());
- btnRepair.BackColor = Color.Yellow;
-
- //string lastRst = GetLastInspectRst(txtBarCode.Text.Trim());
- //if (lastRst.Contains("打磨"))
- //{
- // ShowHint("条码已判定为返喷，无需重复判定");
- // MessageBox.Show("条码已判定为返喷，无需重复判定");
- // Clear();
- // return;
- //}
-
-
- bool rr = SaveBeforeVerify("返喷");
- if (rr == false)
- {
- return;
- }
- SaveRst("", colorName, partName, 9);
-
- }
- else
- {
- ShowHint("根据该零件可回喷次数设置，不能判定为返喷或已超过返喷次数！");
- MessageBox.Show("根据该零件可回喷次数设置，不能判定为返喷或已超过返喷次数！");
- Clear();
- return;
- }
-
+ #region 必须选择缺陷位置与缺陷原因，否则无法保存
+ if (CheckDefect() == false) return;
#endregion
+
+ SaveRst("抛光", _scanPaintRow);
}
- catch(Exception ex)
+
+ catch (Exception ex)
{
- ShowHint("执行返喷操作发生异常,异常原因:"+ex.Message);
- MessageBox.Show("执行返喷操作发生异常,异常原因:" + ex.Message);
+ ShowHint("执行报废操作发生异常,异常原因:" + ex.Message);
+ MessageBox.Show("执行报废操作发生异常,异常原因:" + ex.Message);
Clear();
}
-
}
-
///
/// 报废按钮
///
@@ -491,101 +276,21 @@ namespace PunchingMistake
{
try
{
- if (string.IsNullOrEmpty(txtBarCode.Text.Trim()))
+ if (_scanPaintRow == null)
{
MessageBox.Show("请先扫描数据,然后操作.");
return;
}
- #region 返喷下线数据验证
- if (lableFP.Text.Contains("[返喷]"))
- {
- string barcode = txtBarCode.Text.Trim();
- DataTable dtInspect = Function.GetInspectInfoByBarCode2(barcode);
- if (dtInspect != null && dtInspect.Rows.Count > 0)
- {
- string inspectResult = dtInspect.Rows[0]["inspectResult"].ToString(); //检测结果
- string inspectColorInfo = dtInspect.Rows[0]["remark1"].ToString(); //颜色
- if (inspectResult.Contains("打磨"))
- {
- string createTime = dtInspect.Rows[0]["createTime"].ToString(); //创建时间
- int count = 0;
- string colorInfo = "";
- if (_lineCode == "2")
- {
- count = Function.GetProducColorFromWms(barcode, "TM_BJBMPT_MES_DATA", createTime, ref colorInfo);
- }
- else if (_lineCode == "1")
- {
- count = Function.GetProducColorFromWms(barcode, "TM_BJBMPT_MES_DATA_OLD", createTime, ref colorInfo);
-
- }
- else
- {
-
- }
-
- if (count == 0)
- {
- MessageBox.Show("未发现返喷下线数据！，无法进行质量判定");
- return;
- }
- }
- }
-
- }
- #endregion
-
- // if (MessageBox.Show($"确认对[{txtBarCode.Text}]进行报废操作?", "操作确认", MessageBoxButtons.OKCancel) == DialogResult.Cancel) return;
-
- //UserInput(userName => {
+
- //string userName = Program.UserName;
- // if (string.IsNullOrEmpty(userName))
- // {
- // MessageBox.Show("报废必须录入用户名.");
- // return;
- // }
- // else
- // {
ShowHint("");
#region 必须选择缺陷位置与缺陷原因，否则无法保存
if (CheckDefect() == false) return;
#endregion
+
- #region 判断产品是否有颜色
- string colorName = string.Empty;
- string partName = string.Empty;
- if (CheckColor(ref colorName, ref partName) == false) return;
- #endregion
-
- //string lastRst = GetLastInspectRst(txtBarCode.Text.Trim());
- //if (lastRst.Contains("合格"))
- //{
- // MessageBox.Show("条码已判定为合格，无法重新判定为报废");
- // Clear();
- // return;
- //}
- //if (lastRst.Contains("报废"))
- //{
- // MessageBox.Show("条码已判定为报废，无需重复报废");
- // Clear();
- // return;
- //}
-
- ClearControlColor(SetControlGroup());
- btnAbt.BackColor = Color.Red;
-
- bool rr = SaveBeforeVerify("报废");
- if (rr == false)
- {
- return;
- }
-
- SaveRst("报废", colorName, partName, 2);
-
- // }
- // });
+ SaveRst("报废", _scanPaintRow);
}
catch(Exception ex)
@@ -603,178 +308,24 @@ namespace PunchingMistake
///
///
/// 0-不合格;1-合格；9-返喷 8-其他
- void SaveRst(string state, string colorName, string partName,int isOK,string userName="")
+ void SaveRst(string state, DataRow paintRow, string userName="")
{
if (string.IsNullOrEmpty(userName))
{
userName = Program.UserName;
- }
- if (string.IsNullOrEmpty(userName))
- {
-
- }
-
- if(reason.Contains("点修补") && state!="其它")
- {
- MessageBox.Show("选择[点修补],只能判定为[其它]状态,不能判定为"+ state);
- return;
- }
- string bcode = txtBarCode.Text.Trim();
-
- bool ispass = ScanCodeValidVerify(bcode);
- if (ispass == false)
- {
- txtBarCode.SelectAll();
- return;
- }
-
-
-
+ }
+ string bcode = txtBarCode.Text.Trim();
//保存
- string id = SaveInspect(state, colorName, partName, userName);
-
- try
- {
- if (!string.IsNullOrEmpty(id))
- {
- string interfaceMsg = string.Empty;
- bool rst = SendToWms(txtBarCode.Text.Trim(), isOK,ref interfaceMsg);
- if (rst == false)
- {
- DeleteRepectRst(id, "Web接口调用返回false,原因:" + interfaceMsg, bcode);
- }
- else
- {
- ShowHint(txtBarCode.Text.Trim()+"操作成功",true);
- Clear();
- }
- }
- else
- {
- MessageBox.Show("质检记录保存失败,请重新操作.");
- return;
- }
-
- }
- catch (Exception ex)
- {
- if (ex.Message.Contains("WMS"))
- {
- DeleteRepectRst(id,"Web接口调用抛出异常,异常原因:" + ex.Message , bcode);
- }
- ShowHint(state+"-WMS报工异常,原因:" + ex.Message);
- MessageBox.Show(state+"-WMS报工异常,原因:" + ex.Message);
- LogHelper.WriteLog(state+"-WMS报工调用WMS接口：" + ex.ToString(), MethodBase.GetCurrentMethod().Name);
- }
- }
- private void DeleteRepectRst(string id,string msg,string oneBarCode)
- {
- Function.DelInspectRst(id);
- LogHelper.WriteLog($"接口异常,删除塑件[{oneBarCode}]喷涂质检记录,异常内容:" + msg, MethodBase.GetCurrentMethod().Name);
- }
-
- ///
- ///
- ///
- ///
- ///
- string GetLastInspectRst(string barCode)
- {
- DataTable inspectTable = Function.GetInspectInfoByBarCode2(txtBarCode.Text.Trim());
- if (inspectTable.Rows.Count > 0)
- {
- return inspectTable.Rows[0]["inspectResult"].ToString();
- }
- return "";
- }
-
- ///
- /// 发送wms罢工
- ///
- ///
- /// 0:报废 1:合格 9:返喷
- bool SendToWms(string scanBarCode, int isOk,ref string errorMsg)
- {
- try
- {
- if (_isTest == "true")
- return true;
-
- //WMSWebService webService = new WMSWebService();
- //webService.Url = ConfigurationManager.AppSettings["WMSWebServiceURL"].ToString();
- ////webService.Timeout = 1200000;
- //string errorReason = "";
- ////上次异常提交
- //if (_lastJustDict.Count > 0)
- //{
- // bool rst2 = webService.WMSSprayingForCS(Function.UniteBarCodeToOne(_lastJustDict.First().Key), int.Parse(_lastJustDict.First().Value), out errorReason);
- //}
-
-
- //bool rst = webService.WMSSprayingForCS(Function.UniteBarCodeToOne(scanBarCode), isOk, out errorReason);
- //if (rst == false)
- //{
-
- // MessageBox.Show("调用远程接口失败");
- // ShowHint("调用远程接口失败: " + errorReason);
-
- // _lastJustDict.Clear();
- // _lastJustDict.Add(scanBarCode, isOk.ToString());
-
- // return false;
- //}
- //_lastJustDict.Clear();
- return true;
- }
- catch(Exception ex)
- {
- throw new Exception("WMS接口调用异常,异常原因:" + ex.Message);
- }
-
- }
- ///
- /// 判断产品是否有颜色
- ///
- ///
- bool CheckColor(ref string colorName,ref string partName)
- {
- string[] ss = null;
- if (string.IsNullOrEmpty(labProductInfo.Text))
- {
- MessageBox.Show("颜色信息有误，请重新扫描");
- return false;
- }
- if (labProductInfo.Text.Contains("，"))
- {
- ss = labProductInfo.Text.Split('，');
- }
- else
- {
- ss = labProductInfo.Text.Split(',');
- }
- if (ss.Length >= 1)
- {
- if (string.IsNullOrWhiteSpace(ss[0]))
- {
- MessageBox.Show("无颜色信息，请重新扫描");
- return false;
- }
- }
- else
+ string id = SaveInspect(state, _scanPaintRow, userName);
+ if (!string.IsNullOrEmpty(id))
{
- MessageBox.Show("颜色信息有误1，请重新扫描");
- return false;
+ _scanPaintRow = null;
+ ShowHint("操作成功", true);
+ ClearPage();
}
- colorName = ss[0];
- if (ss.Length > 1)
- {
- if (!string.IsNullOrEmpty(ss[1]))
- {
- partName = ss[1];
- }
- }
- return true;
- }
+
+ }
+
///
/// 必须选择缺陷位置与缺陷原因，否则无法保存
///
@@ -782,7 +333,8 @@ namespace PunchingMistake
bool CheckDefect()
{
string damnPositionTemp = "";
- string reasonTemp = "";
+ string reasonTemp = "";
+ string responsibTemp = "";
//缺陷位置
foreach (Control c in pictureBox2.Controls)
{
@@ -803,12 +355,30 @@ namespace PunchingMistake
reason = reasonTemp;
}
}
+ foreach (Control c in panelResponsibility.Controls)
+ {
+ Label lab = c as Label;
+ if (lab.BackColor != Color.Transparent)
+ {
+ responsibTemp += lab.Text + ";";
+ responsible = responsibTemp;
+ }
+ }
if (string.IsNullOrWhiteSpace(damnPositionTemp) || string.IsNullOrWhiteSpace(reasonTemp))
{
MessageBox.Show("必须选择缺陷位置与缺陷原因，否则无法保存！");
return false;
}
+
+ if (_selectResponsibles.Count == 0)
+ {
+ MessageBox.Show("必须选择责任部门，否则无法保存！");
+ return false;
+ }
+
+
+
return true;
}
///
@@ -818,17 +388,57 @@ namespace PunchingMistake
///
///
/// 返回插入记录的ID
- public string SaveInspect(string inspectResult,string colorName, string partName,string userName)
+ public string SaveInspect(string inspectResult,DataRow scanPaintRow,string userName)
{
try
{
-
+ if (!string.IsNullOrWhiteSpace(txtBarCode.Text.Trim()))
+ {
+ InspectModel model1 = new InspectModel();
+
+ model1.barcode = scanPaintRow["BarCode"].ToString();
+ model1.position = _stationType;
+ model1.stationNo = Program.station;
+ model1.inspectResult =inspectResult;
+
+ model1.damnPosition = position;
+ model1.reason = reason;
+ model1.Responsible = responsible;// string.Join(",", _selectResponsibles);
+
+
+ model1.remark3 = scanPaintRow["remark3"].ToString();
+ model1.ForeignPartCode = scanPaintRow["ForeignPartCode"].ToString();
+ model1.CarType = scanPaintRow["CarType"].ToString();
+
+
+ if (inspectResult != "合格")
+ {
+ if (string.IsNullOrWhiteSpace(model1.damnPosition) || string.IsNullOrWhiteSpace(model1.reason) || string.IsNullOrWhiteSpace(model1.Responsible))
+ {
+ MessageBox.Show("必须选择缺陷位置,缺陷原因与责任部门，否则无法保存！");
+ return "";
+ }
+ }
+ model1.productInfo = scanPaintRow["productInfo"].ToString();
+ model1.side = scanPaintRow["side"].ToString();
+ model1.InspectTimes = "1";
+ model1.remark1 = scanPaintRow["remark1"].ToString();
+ model1.remark2 = scanPaintRow["remark2"].ToString();
+
+ model1.remark3 = scanPaintRow["remark3"].ToString();
+
+ model1.AddMan = userName;
+
+
+ return Function2.InsertInspect3(model1);
+ }
return "";
}
catch (Exception ex)
{
ShowHint("质检提交异常,原因:" + ex.Message);
- LogHelper.WriteLog("质检提交：" + ex.ToString(), MethodBase.GetCurrentMethod().Name);
+ //LogHelper.WriteErrLogBase("质检提交：" + ex.ToString(), MethodBase.GetCurrentMethod().Name);
+ LogHelper.WriteLog("质检提交：" + ex.ToString());
MessageBox.Show("质检提交异常,原因:" + ex.Message);
return null;
}
@@ -856,6 +466,15 @@ namespace PunchingMistake
Label lab = c as Label;
lab.BackColor = Color.Transparent;
}
+ foreach (var cont in panelResponsibility.Controls)
+ {
+ if (cont is Label)
+ {
+ if ((cont as Label).Tag != null && (cont as Label).Tag.ToString() == "Response")
+ (cont as Label).BackColor = Color.Transparent;
+ }
+ }
+
}
///
@@ -871,24 +490,21 @@ namespace PunchingMistake
{
btnOk.Enabled = true;
btnRepair.Enabled = true;
- btnNok.Enabled = true;
lbForeig.Text = "";
ClearPage();
- if (string.IsNullOrEmpty(lbPlanCode.Text))
- {
- throw new Exception("当前没有生产计划.");
- }
ScanBarCode();
+ timer1.Enabled = true;
}
catch (Exception ex)
{
MessageBox.Show("请查看网络是否与服务器连通，无法连通请联系网络管理员。"+ ex);
- LogHelper.WriteLog(ex.ToString(), MethodBase.GetCurrentMethod().Name);
+
+ LogHelper.WriteLog(ex.ToString());
}
}
}
-
+
private void ScanBarCode()
{
try
@@ -896,101 +512,55 @@ namespace PunchingMistake
ButtonEnable(SetControlGroup());
//ClearPage();
+ //测试条码：11111111112222222222
string barcode = txtBarCode.Text.Trim();
- if (barcode.Contains("."))
- {
- barcode = Function.TransToBarCodeOne(barcode);
- }
+
#region 判断条码有效性
- if (! Function.BarCodeValid(barcode))
+ if (! Function3.BarCodeValid(barcode))
{
MessageBox.Show("扫描的条码号："+barcode+"无效，请重新扫描！");
txtBarCode.Text = "";
return;
}
- //bool ispass = ScanCodeValidVerify(barcode);
- //if (ispass == false)
- //{
- // txtBarCode.SelectAll();
- // return;
- //}
-
- DataTable stockInTable = Function2.SearchStockIn(barcode);
- if(stockInTable.Rows.Count == 0)
- {
- ShowHint("扫描半成品码没有喷涂完工记录,无法使用.",false);
- return;
- }
- DataTable punchTable = Function2.SearchPunchCodeRecord(barcode);
- if(punchTable.Rows.Count > 0)
- {
- if(punchTable.Rows[0]["Flag"].ToString() == "0" || punchTable.Rows[0]["Flag"].ToString() == "1")
- {
- ShowHint("扫描半成品码已存在装配记录,无法使用.", false);
- return;
- }
- }
- DataTable productTable = Function2.GetProductInfo(barcode.Substring(0, 10));
- if(productTable.Rows.Count == 0)
- {
- ShowHint($"扫描半成品码的存货代码[{barcode.Substring(0, 10)}]在零件表找不对对应零件号,请检查系统维护.", false);
- return;
- }
- string asselblePartCode = Function2.GetAssemblePartCode(productTable.Rows[0]["PartNo"].ToString(), _stationNo);
+ #endregion
- if(lbProductCode.Text?.ToLower() != asselblePartCode?.ToLower())
+ _scanPaintRow = GetRecentRstInfo(barcode);
+ if(_scanPaintRow["inspectResult"].ToString().Contains("合格") == false)
{
- ShowHint($"扫描半成品码在BOM中对应的总成零件号[{asselblePartCode}]与当前计划的零件号[{lbProductCode.Text}]不匹配.", false);
+ MessageBox.Show("扫描的条码号：" + barcode + "喷涂线不是合格状态，请重新扫描！");
+ txtBarCode.Text = "";
return;
}
-
- DataTable bomTable = Function2.GetBomTable(asselblePartCode, _stationNo);
- List list = bomTable.AsEnumerable().Where(p => p.Field("IsChecked") == 1).ToList();
-
-
- #endregion
-
-
+ labProductInfo.Text = _scanPaintRow["productInfo"].ToString();
- #region 如果是补打的条码，查询产品信息
-
- //if (!barcode.Contains(".") && barcode.Length > 4)
- //{
- // string strCode = barcode.Substring(barcode.Length - 4, 4);
- // int num = 0;
- // Int32.TryParse(strCode, out num);
- // if (num > 7000)
- // {
- // labProductInfo.Text = Function.GetReprintInfo2(barcode);
- // if (string.IsNullOrWhiteSpace(labProductInfo.Text.Trim()))
- // {
- // ButtonDisable(SetControlGroup());
- // labProductInfo.Text = "没有查询到补打条码信息";
- // return;
- // }
- // }
-
- //}
-
- #endregion
-
//根据条码查询，加载图片及原因
int row = 0, col = 0;
string picture = "";
+
+ foreach (var cont in panelResponsibility.Controls)
+ {
+ if (cont is Label)
+ {
+ if ((cont as Label).Tag != null && (cont as Label).Tag.ToString() == "Response")
+ (cont as Label).BackColor = Color.Transparent;
+ }
+ }
+
#region 缺陷原因
try
{
int drow = 0, dcol = 5; //行，列
- DataTable dt3 = Function.SearchDefectInfo(ConfigurationManager.AppSettings["Station"].Trim());
+ DataTable dt3 = Function2.SearchDefectInfo(ConfigurationManager.AppSettings["Station"].Trim());
if (dt3 != null && dt3.Rows.Count > 0)
{
+
drow = Convert.ToInt32(Math.Ceiling((double)dt3.Rows.Count / dcol));
Label[] dLb = new Label[7];
string[] dstr = new string[dt3.Rows.Count];
@@ -1031,8 +601,8 @@ namespace PunchingMistake
}
}
catch (Exception ex)
- {
- LogHelper.WriteLog("缺陷项-"+ex.ToString(), MethodBase.GetCurrentMethod().Name);
+ {
+ LogHelper.WriteLog("缺陷项-" + ex.ToString());
throw ex;
}
@@ -1042,7 +612,7 @@ namespace PunchingMistake
try
{
- DataTable dt2 = Function.SearchInfoByBarCode(barcode);
+ DataTable dt2 = Function2.SearchInfoByBarCode(barcode);
if (dt2 != null && dt2.Rows.Count > 0)
{
@@ -1057,7 +627,7 @@ namespace PunchingMistake
if (!File.Exists(System.IO.Directory.GetCurrentDirectory() + @"\" + picture))
{
- string strImageURL = Function.GetImgPath() + picture;
+ string strImageURL = Function2.GetImgPath() + picture;
if(_isTest != "true")
{
@@ -1076,8 +646,8 @@ namespace PunchingMistake
}
}
catch (Exception ex)
- {
- LogHelper.WriteLog("图片项-" + ex.ToString(), MethodBase.GetCurrentMethod().Name);
+ {
+ LogHelper.WriteLog("图片项-" + ex.ToString());
}
#endregion
@@ -1107,279 +677,54 @@ namespace PunchingMistake
#endregion
- //不是补打的条码，根据条码查询产品信息、检验信息，选中缺陷位置及原因
- DataTable dtInspect = Function.GetInspectInfoByBarCode2(barcode);
- if (dtInspect != null && dtInspect.Rows.Count > 0)
- {
- //List list = dtInspect.AsEnumerable().Where(p => p.Field("inspectResult").Contains("打磨")).ToList();
- //string state = string.Empty;
- //if (list.Count > 0)
- //{
- // state = "返喷";
- //}
- //List list2 = dtInspect.AsEnumerable().Where(p => p.Field("inspectResult").Contains("其它")).ToList();
- //if (list2.Count > 0)
- //{
- // if(list2.Where(p=> p.Field("inspectResult")=="其它WMS").Count() > 0)
- // {
- // state = state + ",其它WMS";
- // }
- // if (list2.Where(p => p.Field("inspectResult") == "其它").Count() > 0)
- // {
- // state = state + ",其它";
- // }
-
- //}
-
- //if (!string.IsNullOrEmpty(state))
- //{
- // lableFP.Text = "存在[" + state + "]状态";
- //}
-
- //_carType = dtInspect.Rows[0]["CarType"].ToString().Trim();
- //labProductInfo.Text = dtInspect.Rows[0]["productInfo"].ToString().Trim(); //产品信息
- ////string position1 = dtInspect.Rows[0]["damnPosition"].ToString(); //缺陷位置
- ////string reason1 = dtInspect.Rows[0]["reason"].ToString(); //原因
- //position= dtInspect.Rows[0]["damnPosition"].ToString(); //缺陷位置
- //reason= dtInspect.Rows[0]["reason"].ToString(); //原因
-
-
-
- //paintId = dtInspect.Rows[0]["remark3"].ToString(); //原因
-
- //string stationNo = dtInspect.Rows[0]["stationNo"].ToString(); //质检工位
- //if(!_stations.Contains(stationNo))
- //{
-
- // //ShowHint(em, false);
- // txtBarCode.Text = "";
- // txtBarCode.TabIndex = 0;
- // txtBarCode.Select();
- // return;
- //}
-
- //#region 选中缺陷位置及原因
-
- //foreach (Control c in pictureBox2.Controls)
- //{
- // Label lab = c as Label;
- // if (position.Contains(lab.Text))
- // {
- // lab.BackColor = Color.FromArgb(150, System.Drawing.Color.Chartreuse);
- // count++;
- // }
- //}
- //foreach (Control c in panel2.Controls)
- //{
- // Label lab = c as Label;
- // if (reason.Contains(lab.Text))
- // {
- // lab.BackColor = Color.Chartreuse;
- // reason += lab.Text + ";";
- // }
- //}
-
- //#endregion
-
- #region 根据一检结果显示一检时的位置--暂时不要
-
- labProPosition.Text = Function.GetFirstInsPosition2(dtInspect);
-
- #endregion
- }
- else
- {
-
- #region 没有一检结果，查询老外数据库，取产品信息
- if ((_isSingleStation==true ))
- {
- string paintError = string.Empty;
- //喷涂线边质检,没有质检结果,查询老外数据库，取产品信息
- string foreignVal = string.Empty;
- if(_lineCode == "2")
- {
- foreignVal = Function.GetProductInfoFrWms(barcode, "TM_BJBMPT_MES_DATA", ref paintError);
- }
- else if (_lineCode == "1")
- {
- foreignVal = Function.GetProductInfoFrWms(barcode, "TM_BJBMPT_MES_DATA_OLD", ref paintError);
-
- }
- else
- {
- foreignVal = Function.GetProductInfo2(barcode, ref paintError);
- }
- if (!string.IsNullOrEmpty(paintError))
- {
- lbForeig.Text = paintError;
- }
- if (string.IsNullOrEmpty(foreignVal))
- {
- return;
- }
- string[] info = foreignVal.Split('，');
- if (!string.IsNullOrEmpty(paintError))
- {
- ShowHint(paintError);
- }
- _foreighColor = info[0];
- labProductInfo.Text = info[0] + "，" + info[1];
- paintId = info[2];
- labProPosition.Tag = paintId;
- labProductInfo.Tag = Function.GetSide(barcode, paintId);
- labProPosition.Text = labProductInfo.Tag.ToString().Replace(';', ' ');
- if (info.Length == 4)
- {
- _foreignPartCode = info[3];
- }
- }
- else
- {
- //库房返喷,没有质检结果,不能查老外库,就是条码不正确
- MessageBox.Show("没有喷涂线边质检记录,无法返喷操作!");
- txtBarCode.Text = "";
- txtBarCode.TabIndex = 0;
- txtBarCode.Select();
- return ;
- }
-
-
- #endregion
- }
-
-
txtBarCode.SelectAll();
}
catch (Exception ex)
{
MessageBox.Show("请查看网络是否与服务器连通，无法连通请联系网络管理员。" + ex.ToString());
- LogHelper.WriteLog("整体项-" + ex.ToString(), MethodBase.GetCurrentMethod().Name);
+ LogHelper.WriteLog("整体项-" + ex.ToString());
}
}
+
///
- /// 一检 二检 点修补扫码是否允许验证
+ /// 喷涂库最新质检记录
///
///
///
- private bool ScanCodeValidVerify(string barcode)
+ private DataRow GetRecentRstInfo(string barcode)
{
- //string position = _stationType;
- // switch (position)
- // {
- // case "下线一检": return First(barcode);
- // case "下线二检": return Second(barcode);;
- // case "下线点修补": return Third(barcode);
- // default:return true;
-
- // }
- return true;
-
- }
-
- private bool First(string barcode)
- {
- if(_isSingleStation == true)
+ //tb_InspectResult 中最新质检结果
+ DataTable dt = Function2.GetLastResult(barcode);
+ if(dt.Rows.Count == 0)
{
- ShowHint("当前系统配置为[单工位生产],无法在此工位扫码,请去终检工位进行操作.", false);
- return false;
+ throw new Exception("塑件条码没有喷涂质检记录");
}
+ DataRow dr = dt.Rows[0];
- DataTable dt = Function.GetLastResult(barcode);
- if (dt.Rows.Count > 0)
- {
- ShowHint("扫描条码["+ barcode + "]已存在质检记录,无法在[下线一检]工位进行重新扫码." , false);
- return false;
- }
- return true;
- }
-
- private bool Second(string barcode)
- {
- DataTable dt = Function.GetLastResult(barcode);
- if (_isSingleStation == false)
+ if(_isTest == "false")
{
- if (dt.Rows.Count == 0)
+ string errorMsg = string.Empty;
+ //wms是否喷涂下线
+ bool isExsit = Function2.GetPointRepairFrWms(barcode, ref errorMsg);
+ if (isExsit == false)
{
- ShowHint("扫描条码[" + barcode + "]不存在[下线一检]记录,无法在[下线二检]工位进行扫码.", false);
- return false;
- }
+ if (!string.IsNullOrEmpty(errorMsg))
+ {
+ throw new Exception("在wms系统的查询返修入库记录时发生错误,错误原因:" + errorMsg);
- DataRow dr = dt.Rows[0];
- if (dr["reason"].ToString().Contains("点修补") && dr["inspectResult"].ToString().Contains("其它"))
- {
- ShowHint("扫描条码[" + barcode + "]上次质量判定为[点修补],无法进行二检扫码.", false);
- return false;
- }
- if (dr["inspectResult"].ToString().Contains("报废"))
- {
- ShowHint("上次质量判定为[报废],无法进行二检扫码.", false);
- return false;
- }
- }
-
-
- return true;
- }
+ }
+ else
+ {
+ throw new Exception("没有在wms系统的返修入库记录,无法进行点修补.");
- ///
- /// 点修补扫码校验
- ///
- ///
- ///
- private bool Third(string barcode)
- {
- string errorMsg = string.Empty;
- bool isExsit = Function. GetPointRepairFrWms(barcode, ref errorMsg);
- if(isExsit == false)
- {
- if (!string.IsNullOrEmpty(errorMsg))
- {
- ShowHint("在wms系统的查询返修入库记录时发生错误,错误原因:"+errorMsg, false);
- return false;
+ }
}
- else{
- ShowHint("没有在wms系统的返修入库记录,无法进行点修补.", false);
- return false;
- }
-
}
- DataTable dt = Function.GetLastResult(barcode);
- if (dt.Rows.Count > 0)
- {
- if(dt.Rows[0]["reason"].ToString().Contains("点修补") && dt.Rows[0]["inspectResult"].ToString().Contains("其它"))
- {
- return true;
- }
- else
- {
- ShowHint("必须上次质量判定记录为点修补,类型为其它,才能在当前[点修补]工位扫码.", false);
- return false;
- }
- }
- else
- {
- ShowHint("没有初始质量判定记录,无法在[点修补]工位扫码.", false);
- return false;
- }
-
-
+ return dr;
}
-
- ///
- /// 设置按钮不可用
- ///
- ///
- private void ButtonDisable(Control[] controls)
- {
- foreach (Control c in controls)
- {
- Button btn = c as Button;
- btn.Enabled = false;
- }
- }
-
+
///
/// 设置按钮可用
///
@@ -1393,11 +738,6 @@ namespace PunchingMistake
}
}
- private void labWorkClass_Click(object sender, EventArgs e)
- {
- Function.ChangeWorkClass(labWorkClass);
- }
-
///
/// 点击退出
///
@@ -1427,117 +767,75 @@ namespace PunchingMistake
txtBarCode.TabIndex = 0;
txtBarCode.Select();
position = "";
- reason = "";
- lableFP.Text = "";
- _foreighColor = "";
- _foreignPartCode = "";
- _carType = string.Empty;
- }
-
- public void ClearRadioButton()
- {
- groupBox1.Controls.Clear();
+ reason = "";
}
+
public void ClearTxtBarcode()
{
txtBarCode.Text = "";
labProPosition.Text = "";
}
+
+ ///
+ /// 其他按钮
+ ///
+ ///
+ ///
+ //private void button1_Click(object sender, EventArgs e)
+ //{
+ // ClearControlColor(SetControlGroup());
+ // //btnPass.BackColor = Color.GreenYellow;
+ // //保存
+ // SaveInspect("其他");
+ // ClearPage();
+ // ClearTxtBarcode();
+ // txtBarCode.TabIndex = 0;
+ //}
- public void LoadScreen()
- {
- DataTable dt = Function2.GetProScreen(_stationNo);
- if (dt != null && dt.Rows.Count > 0)
- {
- SetPage(dt);
- }
-
- }
- private void SetPage(DataTable dt)
+ private void UpdateSoftware()
{
- IsHigh = "1";
- lbPlanCode.Text = "";
- lbProductCode.Text = "";
- lbProductName.Text = "";
-
-
- if (dt != null && dt.Rows.Count > 0)
- {
- lbPlanCode.Text = dt.Rows[0]["OrderNo"].ToString();
- lbPlanCode.Tag = dt.Rows[0]["ID"].ToString();
- lbProductName.Text = dt.Rows[0]["ProductName"].ToString();
- lbProductCode.Text = dt.Rows[0]["PartNo"].ToString();
-
- SetProduceCount(dt.Rows[0]);
- }
-
+ return;
}
- ///
- /// 设置生产数量
- ///
- ///
- void SetProduceCount(DataRow planRow)
+
+
+
+ private void txtBarCode_DoubleClick(object sender, EventArgs e)
{
- int planQty = 0;
- int okQty = 0;
- int badQty = 0;
- int repairQty = 0;
-
- int.TryParse(planRow["OrderCount"].ToString(), out planQty);
- int.TryParse(planRow["OKCount"].ToString(), out okQty);
- int.TryParse(planRow["BadCount"].ToString(), out badQty);
- int.TryParse(planRow["RepairCount"].ToString(), out repairQty);
- lbPlanQty.Text = planQty.ToString();
- lbPlanCompleteQty.Text = (okQty+ badQty).ToString();
- lbOkCount.Text = okQty.ToString();
- lbRepairCount.Text = repairQty.ToString();
- lbBadCount.Text = badQty.ToString();
+ txtBarCode.SelectAll();
}
- private void btnPlanUp_Click(object sender, EventArgs e)
+ private void panelResponsibility_Paint(object sender, PaintEventArgs e)
{
- LoadPlanScreen(lbPlanCode.Tag?.ToString(), "上一计划");
- txtBarCode.Select();
- txtBarCode.Focus();
+
}
+
- private void btnPlanDown_Click(object sender, EventArgs e)
+ private void Responsibility_Click(object sender, EventArgs e)
{
- LoadPlanScreen(lbPlanCode.Tag?.ToString(), "下一计划");
- txtBarCode.Select();
- txtBarCode.Focus();
- }
- public void LoadPlanScreen(string id, string plan)
- {
-
- DataTable dt = Function2.GetProScreenPlan(id, _stationNo, plan);
- if (dt != null && dt.Rows.Count > 0)
- {
- SetPage(dt);
- }
- else
+ Label a = (Label)sender;
+
+ foreach (var cont in panelResponsibility.Controls)
{
- if (plan == "下一计划")
- {
- MessageBox.Show("无下一计划");
- txtBarCode.SelectAll();
- txtBarCode.Focus();
- }
- else
+ if (cont is Label)
{
- MessageBox.Show("无上一计划");
- txtBarCode.SelectAll();
- txtBarCode.Focus();
+ if ((cont as Label).Tag != null && (cont as Label).Tag.ToString() == "Response")
+ (cont as Label).BackColor = Color.Transparent;
}
}
- txtBarCode.SelectAll();
- txtBarCode.Focus();
- }
- private void txtBarCode_DoubleClick(object sender, EventArgs e)
- {
- txtBarCode.SelectAll();
+ if (a.BackColor == Color.Transparent)
+ {
+ a.BackColor = Color.Chartreuse;
+ _selectResponsibles.Clear();
+ _selectResponsibles.Add(a.Text);
+
+ }
+ else
+ {
+ a.BackColor = Color.Transparent;
+ _selectResponsibles.Clear();
+ }
}
}
diff --git a/PunchingMistake/FrmQualityNew.resx b/PunchingMistake/FrmQualityNew.resx
index 3d1eb78..4d6430c 100644
--- a/PunchingMistake/FrmQualityNew.resx
+++ b/PunchingMistake/FrmQualityNew.resx
@@ -472,4 +472,7 @@
RK5CYII=
+
+ 17, 17
+
\ No newline at end of file
diff --git a/PunchingMistake/FrmQualityNew1.Designer.cs b/PunchingMistake/FrmQualityNew1.Designer.cs
new file mode 100644
index 0000000..116fecd
--- /dev/null
+++ b/PunchingMistake/FrmQualityNew1.Designer.cs
@@ -0,0 +1,656 @@
+namespace PunchingMistake
+{
+ partial class FrmQualityNew1
+ {
+ ///
+ /// 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)
+ {
+ try
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+ catch
+ {
+
+ }
+ }
+
+ #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()
+ {
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmQualityNew1));
+ this.labTime = new System.Windows.Forms.Label();
+ this.pictureBox1 = new System.Windows.Forms.PictureBox();
+ this.labTitle = new System.Windows.Forms.Label();
+ this.panel2 = new System.Windows.Forms.Panel();
+ this.pictureBox2 = new System.Windows.Forms.PictureBox();
+ this.label15 = new System.Windows.Forms.Label();
+ this.labProductInfo = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
+ this.txtBarCode = new System.Windows.Forms.TextBox();
+ this.labProPosition = new System.Windows.Forms.Label();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.button4 = new System.Windows.Forms.Button();
+ this.button3 = new System.Windows.Forms.Button();
+ this.btnPlanDown = new System.Windows.Forms.Button();
+ this.btnPlanUp = new System.Windows.Forms.Button();
+ this.btnOk = new System.Windows.Forms.Button();
+ this.btnRepair = new System.Windows.Forms.Button();
+ this.btnNok = new System.Windows.Forms.Button();
+ this.btnAbt = new System.Windows.Forms.Button();
+ this.lableFP = new System.Windows.Forms.Label();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.lbProductName = new System.Windows.Forms.Label();
+ this.lbProductCode = new System.Windows.Forms.Label();
+ this.label10 = new System.Windows.Forms.Label();
+ this.label9 = new System.Windows.Forms.Label();
+ this.label8 = new System.Windows.Forms.Label();
+ this.lbPlanCode = new System.Windows.Forms.Label();
+ this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.lbPlanQty = new System.Windows.Forms.Label();
+ this.groupBox3 = new System.Windows.Forms.GroupBox();
+ this.lbPlanCompleteQty = new System.Windows.Forms.Label();
+ this.groupBox4 = new System.Windows.Forms.GroupBox();
+ this.lbOkCount = new System.Windows.Forms.Label();
+ this.groupBox5 = new System.Windows.Forms.GroupBox();
+ this.lbRepairCount = new System.Windows.Forms.Label();
+ this.groupBox6 = new System.Windows.Forms.GroupBox();
+ this.lbBadCount = new System.Windows.Forms.Label();
+ this.lbForeig = new System.Windows.Forms.Label();
+ this.labWorkClass = new System.Windows.Forms.Label();
+ this.labStation = new System.Windows.Forms.Label();
+ this.labelVersion = new System.Windows.Forms.Label();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
+ this.panel1.SuspendLayout();
+ this.groupBox1.SuspendLayout();
+ this.groupBox2.SuspendLayout();
+ this.groupBox3.SuspendLayout();
+ this.groupBox4.SuspendLayout();
+ this.groupBox5.SuspendLayout();
+ this.groupBox6.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // labTime
+ //
+ this.labTime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.labTime.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.labTime.Location = new System.Drawing.Point(1867, 17);
+ this.labTime.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.labTime.Name = "labTime";
+ this.labTime.Size = new System.Drawing.Size(457, 146);
+ this.labTime.TabIndex = 18;
+ this.labTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.labTime.Click += new System.EventHandler(this.labTime_Click);
+ //
+ // pictureBox1
+ //
+ this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
+ this.pictureBox1.Location = new System.Drawing.Point(22, 17);
+ this.pictureBox1.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.pictureBox1.Name = "pictureBox1";
+ this.pictureBox1.Size = new System.Drawing.Size(291, 146);
+ this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.pictureBox1.TabIndex = 17;
+ this.pictureBox1.TabStop = false;
+ //
+ // labTitle
+ //
+ this.labTitle.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.labTitle.Font = new System.Drawing.Font("宋体", 48F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.labTitle.Location = new System.Drawing.Point(296, 17);
+ this.labTitle.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.labTitle.Name = "labTitle";
+ this.labTitle.Size = new System.Drawing.Size(1576, 146);
+ this.labTitle.TabIndex = 16;
+ this.labTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // panel2
+ //
+ this.panel2.Location = new System.Drawing.Point(18, 870);
+ this.panel2.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel2.Name = "panel2";
+ this.panel2.Size = new System.Drawing.Size(1829, 578);
+ this.panel2.TabIndex = 48;
+ //
+ // pictureBox2
+ //
+ this.pictureBox2.Location = new System.Drawing.Point(18, 352);
+ this.pictureBox2.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.pictureBox2.Name = "pictureBox2";
+ this.pictureBox2.Size = new System.Drawing.Size(1829, 509);
+ this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.pictureBox2.TabIndex = 47;
+ this.pictureBox2.TabStop = false;
+ //
+ // label15
+ //
+ this.label15.BackColor = System.Drawing.Color.Lime;
+ this.label15.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label15.Location = new System.Drawing.Point(21, 163);
+ this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label15.Name = "label15";
+ this.label15.Size = new System.Drawing.Size(292, 130);
+ this.label15.TabIndex = 49;
+ this.label15.Text = "扫码信息";
+ this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // labProductInfo
+ //
+ this.labProductInfo.BackColor = System.Drawing.Color.White;
+ this.labProductInfo.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.labProductInfo.Location = new System.Drawing.Point(1407, 163);
+ this.labProductInfo.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.labProductInfo.Name = "labProductInfo";
+ this.labProductInfo.Size = new System.Drawing.Size(917, 130);
+ this.labProductInfo.TabIndex = 52;
+ this.labProductInfo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // label2
+ //
+ this.label2.BackColor = System.Drawing.Color.Lime;
+ this.label2.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label2.Location = new System.Drawing.Point(1106, 163);
+ this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(292, 130);
+ this.label2.TabIndex = 51;
+ this.label2.Text = "产品信息";
+ this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // txtBarCode
+ //
+ this.txtBarCode.BackColor = System.Drawing.Color.White;
+ this.txtBarCode.Font = new System.Drawing.Font("黑体", 30F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtBarCode.Location = new System.Drawing.Point(325, 184);
+ this.txtBarCode.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.txtBarCode.Name = "txtBarCode";
+ this.txtBarCode.Size = new System.Drawing.Size(764, 87);
+ this.txtBarCode.TabIndex = 0;
+ this.txtBarCode.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ this.txtBarCode.DoubleClick += new System.EventHandler(this.txtBarCode_DoubleClick);
+ this.txtBarCode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBarCode_KeyDown);
+ //
+ // labProPosition
+ //
+ this.labProPosition.BackColor = System.Drawing.Color.White;
+ this.labProPosition.Font = new System.Drawing.Font("黑体", 22F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.labProPosition.Location = new System.Drawing.Point(1870, 315);
+ this.labProPosition.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.labProPosition.Name = "labProPosition";
+ this.labProPosition.Size = new System.Drawing.Size(465, 151);
+ this.labProPosition.TabIndex = 64;
+ this.labProPosition.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // panel1
+ //
+ this.panel1.AutoScroll = true;
+ this.panel1.Controls.Add(this.button4);
+ this.panel1.Controls.Add(this.button3);
+ this.panel1.Controls.Add(this.btnPlanDown);
+ this.panel1.Controls.Add(this.btnPlanUp);
+ this.panel1.Controls.Add(this.btnOk);
+ this.panel1.Controls.Add(this.btnRepair);
+ this.panel1.Controls.Add(this.btnNok);
+ this.panel1.Controls.Add(this.btnAbt);
+ this.panel1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.panel1.Location = new System.Drawing.Point(18, 1469);
+ this.panel1.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(1829, 317);
+ this.panel1.TabIndex = 66;
+ //
+ // button4
+ //
+ this.button4.BackColor = System.Drawing.Color.Red;
+ this.button4.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.button4.Location = new System.Drawing.Point(1275, 181);
+ this.button4.Name = "button4";
+ this.button4.Size = new System.Drawing.Size(326, 90);
+ this.button4.TabIndex = 74;
+ this.button4.Text = "结束计划";
+ this.button4.UseVisualStyleBackColor = false;
+ //
+ // button3
+ //
+ this.button3.BackColor = System.Drawing.Color.LawnGreen;
+ this.button3.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.button3.Location = new System.Drawing.Point(1275, 45);
+ this.button3.Name = "button3";
+ this.button3.Size = new System.Drawing.Size(326, 90);
+ this.button3.TabIndex = 73;
+ this.button3.Text = "计划查询";
+ this.button3.UseVisualStyleBackColor = false;
+ //
+ // btnPlanDown
+ //
+ this.btnPlanDown.BackColor = System.Drawing.Color.LawnGreen;
+ this.btnPlanDown.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnPlanDown.Location = new System.Drawing.Point(852, 181);
+ this.btnPlanDown.Name = "btnPlanDown";
+ this.btnPlanDown.Size = new System.Drawing.Size(326, 81);
+ this.btnPlanDown.TabIndex = 72;
+ this.btnPlanDown.Text = "下一计划";
+ this.btnPlanDown.UseVisualStyleBackColor = false;
+ this.btnPlanDown.Click += new System.EventHandler(this.btnPlanDown_Click);
+ //
+ // btnPlanUp
+ //
+ this.btnPlanUp.BackColor = System.Drawing.Color.LawnGreen;
+ this.btnPlanUp.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnPlanUp.Location = new System.Drawing.Point(852, 45);
+ this.btnPlanUp.Name = "btnPlanUp";
+ this.btnPlanUp.Size = new System.Drawing.Size(326, 90);
+ this.btnPlanUp.TabIndex = 71;
+ this.btnPlanUp.Text = "上一计划";
+ this.btnPlanUp.UseVisualStyleBackColor = false;
+ this.btnPlanUp.Click += new System.EventHandler(this.btnPlanUp_Click);
+ //
+ // btnOk
+ //
+ this.btnOk.BackColor = System.Drawing.Color.LawnGreen;
+ this.btnOk.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnOk.Location = new System.Drawing.Point(30, 45);
+ this.btnOk.Name = "btnOk";
+ this.btnOk.Size = new System.Drawing.Size(326, 90);
+ this.btnOk.TabIndex = 67;
+ this.btnOk.Text = "合 格";
+ this.btnOk.UseVisualStyleBackColor = false;
+ this.btnOk.Click += new System.EventHandler(this.btnOk_Click);
+ //
+ // btnRepair
+ //
+ this.btnRepair.BackColor = System.Drawing.Color.DodgerBlue;
+ this.btnRepair.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnRepair.Location = new System.Drawing.Point(30, 181);
+ this.btnRepair.Name = "btnRepair";
+ this.btnRepair.Size = new System.Drawing.Size(326, 90);
+ this.btnRepair.TabIndex = 69;
+ this.btnRepair.Text = "返修";
+ this.btnRepair.UseVisualStyleBackColor = false;
+ this.btnRepair.Click += new System.EventHandler(this.btnRepair_Click);
+ //
+ // btnNok
+ //
+ this.btnNok.BackColor = System.Drawing.Color.Yellow;
+ this.btnNok.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnNok.Location = new System.Drawing.Point(466, 45);
+ this.btnNok.Name = "btnNok";
+ this.btnNok.Size = new System.Drawing.Size(321, 90);
+ this.btnNok.TabIndex = 68;
+ this.btnNok.Text = "返修合格";
+ this.btnNok.UseVisualStyleBackColor = false;
+ this.btnNok.Click += new System.EventHandler(this.btnNok_Click);
+ //
+ // btnAbt
+ //
+ this.btnAbt.BackColor = System.Drawing.Color.OrangeRed;
+ this.btnAbt.Font = new System.Drawing.Font("宋体", 25.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnAbt.Location = new System.Drawing.Point(466, 181);
+ this.btnAbt.Name = "btnAbt";
+ this.btnAbt.Size = new System.Drawing.Size(314, 90);
+ this.btnAbt.TabIndex = 70;
+ this.btnAbt.Text = "报 废";
+ this.btnAbt.UseVisualStyleBackColor = false;
+ this.btnAbt.Click += new System.EventHandler(this.btnAbt_Click);
+ //
+ // lableFP
+ //
+ this.lableFP.AutoSize = true;
+ this.lableFP.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lableFP.ForeColor = System.Drawing.Color.Red;
+ this.lableFP.Location = new System.Drawing.Point(2201, 552);
+ this.lableFP.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lableFP.Name = "lableFP";
+ this.lableFP.Size = new System.Drawing.Size(106, 42);
+ this.lableFP.TabIndex = 71;
+ this.lableFP.Tag = "存在返喷";
+ this.lableFP.Text = " ";
+ //
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.lbProductName);
+ this.groupBox1.Controls.Add(this.lbProductCode);
+ this.groupBox1.Controls.Add(this.label10);
+ this.groupBox1.Controls.Add(this.label9);
+ this.groupBox1.Controls.Add(this.label8);
+ this.groupBox1.Controls.Add(this.lbPlanCode);
+ this.groupBox1.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.groupBox1.ForeColor = System.Drawing.Color.Blue;
+ this.groupBox1.Location = new System.Drawing.Point(1879, 604);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(456, 192);
+ this.groupBox1.TabIndex = 72;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "当前计划";
+ //
+ // lbProductName
+ //
+ this.lbProductName.AutoSize = true;
+ this.lbProductName.ForeColor = System.Drawing.Color.Black;
+ this.lbProductName.Location = new System.Drawing.Point(114, 156);
+ this.lbProductName.Name = "lbProductName";
+ this.lbProductName.Size = new System.Drawing.Size(105, 33);
+ this.lbProductName.TabIndex = 5;
+ this.lbProductName.Text = " ";
+ //
+ // lbProductCode
+ //
+ this.lbProductCode.AutoSize = true;
+ this.lbProductCode.ForeColor = System.Drawing.Color.Black;
+ this.lbProductCode.Location = new System.Drawing.Point(114, 105);
+ this.lbProductCode.Name = "lbProductCode";
+ this.lbProductCode.Size = new System.Drawing.Size(87, 33);
+ this.lbProductCode.TabIndex = 4;
+ this.lbProductCode.Text = " ";
+ //
+ // label10
+ //
+ this.label10.AutoSize = true;
+ this.label10.ForeColor = System.Drawing.Color.Black;
+ this.label10.Location = new System.Drawing.Point(17, 156);
+ this.label10.Name = "label10";
+ this.label10.Size = new System.Drawing.Size(83, 33);
+ this.label10.TabIndex = 3;
+ this.label10.Text = "描述";
+ //
+ // label9
+ //
+ this.label9.AutoSize = true;
+ this.label9.ForeColor = System.Drawing.Color.Black;
+ this.label9.Location = new System.Drawing.Point(16, 105);
+ this.label9.Name = "label9";
+ this.label9.Size = new System.Drawing.Size(83, 33);
+ this.label9.TabIndex = 2;
+ this.label9.Text = "产品";
+ //
+ // label8
+ //
+ this.label8.AutoSize = true;
+ this.label8.ForeColor = System.Drawing.Color.Black;
+ this.label8.Location = new System.Drawing.Point(16, 55);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(83, 33);
+ this.label8.TabIndex = 1;
+ this.label8.Text = "编号";
+ //
+ // lbPlanCode
+ //
+ this.lbPlanCode.AutoSize = true;
+ this.lbPlanCode.ForeColor = System.Drawing.Color.Black;
+ this.lbPlanCode.Location = new System.Drawing.Point(114, 55);
+ this.lbPlanCode.Name = "lbPlanCode";
+ this.lbPlanCode.Size = new System.Drawing.Size(87, 33);
+ this.lbPlanCode.TabIndex = 0;
+ this.lbPlanCode.Text = " ";
+ //
+ // groupBox2
+ //
+ this.groupBox2.Controls.Add(this.lbPlanQty);
+ this.groupBox2.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.groupBox2.ForeColor = System.Drawing.Color.Blue;
+ this.groupBox2.Location = new System.Drawing.Point(1879, 821);
+ this.groupBox2.Name = "groupBox2";
+ this.groupBox2.Size = new System.Drawing.Size(456, 138);
+ this.groupBox2.TabIndex = 73;
+ this.groupBox2.TabStop = false;
+ this.groupBox2.Text = "生产计划数量";
+ //
+ // lbPlanQty
+ //
+ this.lbPlanQty.AutoSize = true;
+ this.lbPlanQty.Font = new System.Drawing.Font("宋体", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbPlanQty.ForeColor = System.Drawing.Color.Black;
+ this.lbPlanQty.Location = new System.Drawing.Point(41, 40);
+ this.lbPlanQty.Name = "lbPlanQty";
+ this.lbPlanQty.Size = new System.Drawing.Size(78, 84);
+ this.lbPlanQty.TabIndex = 1;
+ this.lbPlanQty.Text = "0";
+ //
+ // groupBox3
+ //
+ this.groupBox3.Controls.Add(this.lbPlanCompleteQty);
+ this.groupBox3.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.groupBox3.ForeColor = System.Drawing.Color.Blue;
+ this.groupBox3.Location = new System.Drawing.Point(1885, 983);
+ this.groupBox3.Name = "groupBox3";
+ this.groupBox3.Size = new System.Drawing.Size(456, 138);
+ this.groupBox3.TabIndex = 74;
+ this.groupBox3.TabStop = false;
+ this.groupBox3.Text = "计划完成数量";
+ //
+ // lbPlanCompleteQty
+ //
+ this.lbPlanCompleteQty.AutoSize = true;
+ this.lbPlanCompleteQty.Font = new System.Drawing.Font("宋体", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbPlanCompleteQty.ForeColor = System.Drawing.Color.Black;
+ this.lbPlanCompleteQty.Location = new System.Drawing.Point(36, 40);
+ this.lbPlanCompleteQty.Name = "lbPlanCompleteQty";
+ this.lbPlanCompleteQty.Size = new System.Drawing.Size(78, 84);
+ this.lbPlanCompleteQty.TabIndex = 0;
+ this.lbPlanCompleteQty.Text = "0";
+ //
+ // groupBox4
+ //
+ this.groupBox4.Controls.Add(this.lbOkCount);
+ this.groupBox4.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.groupBox4.ForeColor = System.Drawing.Color.Blue;
+ this.groupBox4.Location = new System.Drawing.Point(1885, 1153);
+ this.groupBox4.Name = "groupBox4";
+ this.groupBox4.Size = new System.Drawing.Size(456, 138);
+ this.groupBox4.TabIndex = 75;
+ this.groupBox4.TabStop = false;
+ this.groupBox4.Text = "合格数量";
+ //
+ // lbOkCount
+ //
+ this.lbOkCount.AutoSize = true;
+ this.lbOkCount.Font = new System.Drawing.Font("宋体", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbOkCount.ForeColor = System.Drawing.Color.Black;
+ this.lbOkCount.Location = new System.Drawing.Point(36, 40);
+ this.lbOkCount.Name = "lbOkCount";
+ this.lbOkCount.Size = new System.Drawing.Size(78, 84);
+ this.lbOkCount.TabIndex = 1;
+ this.lbOkCount.Text = "0";
+ //
+ // groupBox5
+ //
+ this.groupBox5.Controls.Add(this.lbRepairCount);
+ this.groupBox5.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.groupBox5.ForeColor = System.Drawing.Color.Blue;
+ this.groupBox5.Location = new System.Drawing.Point(1885, 1324);
+ this.groupBox5.Name = "groupBox5";
+ this.groupBox5.Size = new System.Drawing.Size(456, 138);
+ this.groupBox5.TabIndex = 76;
+ this.groupBox5.TabStop = false;
+ this.groupBox5.Text = "返修数量";
+ //
+ // lbRepairCount
+ //
+ this.lbRepairCount.AutoSize = true;
+ this.lbRepairCount.Font = new System.Drawing.Font("宋体", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbRepairCount.ForeColor = System.Drawing.Color.Black;
+ this.lbRepairCount.Location = new System.Drawing.Point(36, 40);
+ this.lbRepairCount.Name = "lbRepairCount";
+ this.lbRepairCount.Size = new System.Drawing.Size(78, 84);
+ this.lbRepairCount.TabIndex = 1;
+ this.lbRepairCount.Text = "0";
+ //
+ // groupBox6
+ //
+ this.groupBox6.Controls.Add(this.lbBadCount);
+ this.groupBox6.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.groupBox6.ForeColor = System.Drawing.Color.Blue;
+ this.groupBox6.Location = new System.Drawing.Point(1885, 1494);
+ this.groupBox6.Name = "groupBox6";
+ this.groupBox6.Size = new System.Drawing.Size(456, 138);
+ this.groupBox6.TabIndex = 77;
+ this.groupBox6.TabStop = false;
+ this.groupBox6.Text = "报废数量";
+ //
+ // lbBadCount
+ //
+ this.lbBadCount.AutoSize = true;
+ this.lbBadCount.Font = new System.Drawing.Font("宋体", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbBadCount.ForeColor = System.Drawing.Color.Black;
+ this.lbBadCount.Location = new System.Drawing.Point(36, 40);
+ this.lbBadCount.Name = "lbBadCount";
+ this.lbBadCount.Size = new System.Drawing.Size(78, 84);
+ this.lbBadCount.TabIndex = 1;
+ this.lbBadCount.Text = "0";
+ //
+ // lbForeig
+ //
+ this.lbForeig.AutoSize = true;
+ this.lbForeig.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbForeig.Location = new System.Drawing.Point(26, 306);
+ this.lbForeig.Name = "lbForeig";
+ this.lbForeig.Size = new System.Drawing.Size(69, 33);
+ this.lbForeig.TabIndex = 78;
+ this.lbForeig.Text = " ";
+ //
+ // labWorkClass
+ //
+ this.labWorkClass.AutoSize = true;
+ this.labWorkClass.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.labWorkClass.Location = new System.Drawing.Point(1879, 487);
+ this.labWorkClass.Name = "labWorkClass";
+ this.labWorkClass.Size = new System.Drawing.Size(67, 33);
+ this.labWorkClass.TabIndex = 79;
+ this.labWorkClass.Text = "A班";
+ //
+ // labStation
+ //
+ this.labStation.AutoSize = true;
+ this.labStation.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.labStation.Location = new System.Drawing.Point(2123, 487);
+ this.labStation.Name = "labStation";
+ this.labStation.Size = new System.Drawing.Size(69, 33);
+ this.labStation.TabIndex = 80;
+ this.labStation.Text = "F02";
+ //
+ // labelVersion
+ //
+ this.labelVersion.AutoSize = true;
+ this.labelVersion.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.labelVersion.Location = new System.Drawing.Point(1879, 552);
+ this.labelVersion.Name = "labelVersion";
+ this.labelVersion.Size = new System.Drawing.Size(159, 33);
+ this.labelVersion.TabIndex = 81;
+ this.labelVersion.Text = "10.0.0.1";
+ //
+ // FrmQualityNew
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(2351, 1789);
+ this.Controls.Add(this.labelVersion);
+ this.Controls.Add(this.labStation);
+ this.Controls.Add(this.labWorkClass);
+ this.Controls.Add(this.lbForeig);
+ this.Controls.Add(this.groupBox6);
+ this.Controls.Add(this.groupBox5);
+ this.Controls.Add(this.groupBox4);
+ this.Controls.Add(this.groupBox3);
+ this.Controls.Add(this.groupBox2);
+ this.Controls.Add(this.groupBox1);
+ this.Controls.Add(this.panel1);
+ this.Controls.Add(this.lableFP);
+ this.Controls.Add(this.labProPosition);
+ this.Controls.Add(this.txtBarCode);
+ this.Controls.Add(this.labProductInfo);
+ this.Controls.Add(this.label2);
+ this.Controls.Add(this.label15);
+ this.Controls.Add(this.panel2);
+ this.Controls.Add(this.pictureBox2);
+ this.Controls.Add(this.labTime);
+ this.Controls.Add(this.pictureBox1);
+ this.Controls.Add(this.labTitle);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+ this.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+ this.Name = "FrmQualityNew";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+ this.Text = "喷涂质检";
+ this.Load += new System.EventHandler(this.FrmSecondCheck_Load);
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
+ this.panel1.ResumeLayout(false);
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
+ this.groupBox2.ResumeLayout(false);
+ this.groupBox2.PerformLayout();
+ this.groupBox3.ResumeLayout(false);
+ this.groupBox3.PerformLayout();
+ this.groupBox4.ResumeLayout(false);
+ this.groupBox4.PerformLayout();
+ this.groupBox5.ResumeLayout(false);
+ this.groupBox5.PerformLayout();
+ this.groupBox6.ResumeLayout(false);
+ this.groupBox6.PerformLayout();
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+ private System.Windows.Forms.Label labTime;
+ private System.Windows.Forms.PictureBox pictureBox1;
+ private System.Windows.Forms.Label labTitle;
+ private System.Windows.Forms.Panel panel2;
+ private System.Windows.Forms.PictureBox pictureBox2;
+ private System.Windows.Forms.Label label15;
+ private System.Windows.Forms.Label labProductInfo;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.TextBox txtBarCode;
+ private System.Windows.Forms.Label labProPosition;
+ private System.Windows.Forms.Panel panel1;
+ private System.Windows.Forms.Button btnOk;
+ private System.Windows.Forms.Button btnNok;
+ private System.Windows.Forms.Button btnRepair;
+ private System.Windows.Forms.Button btnAbt;
+ private System.Windows.Forms.Label lableFP;
+ private System.Windows.Forms.Button btnPlanDown;
+ private System.Windows.Forms.Button btnPlanUp;
+ private System.Windows.Forms.Button button4;
+ private System.Windows.Forms.Button button3;
+ private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.GroupBox groupBox2;
+ private System.Windows.Forms.GroupBox groupBox3;
+ private System.Windows.Forms.GroupBox groupBox4;
+ private System.Windows.Forms.GroupBox groupBox5;
+ private System.Windows.Forms.GroupBox groupBox6;
+ private System.Windows.Forms.Label lbForeig;
+ private System.Windows.Forms.Label labWorkClass;
+ private System.Windows.Forms.Label labStation;
+ private System.Windows.Forms.Label labelVersion;
+ private System.Windows.Forms.Label lbPlanCode;
+ private System.Windows.Forms.Label lbPlanCompleteQty;
+ private System.Windows.Forms.Label lbOkCount;
+ private System.Windows.Forms.Label lbRepairCount;
+ private System.Windows.Forms.Label lbBadCount;
+ private System.Windows.Forms.Label lbPlanQty;
+ private System.Windows.Forms.Label label8;
+ private System.Windows.Forms.Label label10;
+ private System.Windows.Forms.Label label9;
+ private System.Windows.Forms.Label lbProductName;
+ private System.Windows.Forms.Label lbProductCode;
+ }
+}
\ No newline at end of file
diff --git a/PunchingMistake/FrmQualityNew1.cs b/PunchingMistake/FrmQualityNew1.cs
new file mode 100644
index 0000000..fdb5f38
--- /dev/null
+++ b/PunchingMistake/FrmQualityNew1.cs
@@ -0,0 +1,1544 @@
+
+using PaintingPC.Model;
+using PaintingPC.WebReference;
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Drawing;
+using System.IO;
+using System.Net.NetworkInformation;
+using System.Reflection;
+using System.Threading;
+using System.Windows.Forms;
+using MESClassLibrary.BLL.BasicInfo;
+using static System.Windows.Forms.AxHost;
+using PaintingPC;
+
+namespace PunchingMistake
+{
+ public partial class FrmQualityNew1 : Form
+ {
+ int count = 0; //缺陷图选择个数
+ public static string ColorName = ""; //修改颜色
+ public static string paintId = "";
+
+ private static string position = "", reason = "";
+
+ private string _carType = string.Empty;
+ private Dictionary _lastJustDict = new Dictionary();
+ private string _foreighColor = string.Empty;
+ private string _lineCode = string.Empty;
+ private List _stations = new List();
+
+ private StationBLL _stationBLL = new StationBLL();
+ ///
+ /// 从tb_ForeignColorMap表得到的零件号
+ ///
+ private string _foreignPartCode = string.Empty;
+ private bool _isSingleStation = false;
+ private string _isTest = "false";
+ private string _stationNo = "";
+ private string IsHigh = "1";
+ public FrmQualityNew1()
+ {
+ InitializeComponent();
+ //WindowState = FormWindowState.Normal;
+ this.Size = new Size(1280, 1020);
+
+
+
+ }
+
+
+
+
+ private void FrmSecondCheck_Load(object sender, EventArgs e)
+ {
+ try
+ {
+ Control.CheckForIllegalCrossThreadCalls = false;
+ InitPage();
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show("网络故障，请联系网络管理员");
+ LogHelper.WriteLog(ex.ToString(), MethodBase.GetCurrentMethod().Name);
+ }
+ }
+
+ public void InitPage()
+ {
+ try
+ {
+ string title = ConfigurationManager.AppSettings["Display"].ToString();
+ string workClass = Function.GetWorkClass2();
+ _stationNo = ConfigurationManager.AppSettings["Station"].ToString();
+
+ labTitle.Text = title;
+
+ labWorkClass.Text = workClass;
+ labStation.Text = _stationNo;
+ labelVersion.Text = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
+
+ LoadScreen();
+
+
+ Thread t = new Thread(new ThreadStart(TimeGo));
+ t.Start();
+ }
+ catch (Exception ex)
+ { }
+ }
+
+
+
+ private void TimeGo()
+ {
+ System.Timers.Timer timer = new System.Timers.Timer();
+ timer.Interval = 10;
+ timer.Enabled = true;
+ timer.Elapsed += new System.Timers.ElapsedEventHandler(timer_Tick);
+ }
+
+ private void timer_Tick(object sender, EventArgs e)
+ {
+ try
+ {
+ labTime.Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ Thread.Sleep(500);
+ }
+ catch
+ {
+
+ }
+ }
+
+ ///
+ /// 缺陷图点击
+ ///
+ ///
+ ///
+ void lblRoom_Click(object sender, EventArgs e)
+ {
+ Label a = (Label)sender;
+ string aa = a.Text;
+ if (a.BackColor == Color.Transparent)
+ {
+ a.BackColor = Color.FromArgb(150, System.Drawing.Color.Chartreuse);
+ position += aa;
+ count++;
+ }
+ else
+ {
+ a.BackColor = Color.Transparent;
+ count--;
+ }
+ }
+
+ ///
+ /// 缺陷原因点击
+ ///
+ ///
+ ///
+ void dLbRoom_Click(object sender, EventArgs e)
+ {
+ if (count == 0)
+ {
+ MessageBox.Show("请选择缺陷区域！");
+ return;
+ }
+ Label a = (Label)sender;
+ string aa = a.Text;
+ if (a.BackColor == Color.Transparent)
+ {
+ a.BackColor = Color.Chartreuse;
+ reason += a.Text + ";";
+ }
+ else
+ {
+ a.BackColor = Color.Transparent;
+ reason = reason.Replace(a.Text + ";", "");
+ }
+ }
+
+ private Control[] SetControlGroup()
+ {
+ //Control[] controls = { btnPass, btnAbt, btnRepair };
+ Control[] controls = { };
+ return controls;
+ }
+
+ ///
+ /// 清除控件选中
+ ///
+ ///
+ public void ClearControlColor(Control[] controls)
+ {
+ foreach (Control c in controls)
+ {
+ c.BackColor = Color.LightGray;
+ }
+ }
+
+ bool SaveBeforeVerify( string currentRst)
+ {
+ string lastRst = GetLastInspectRst(txtBarCode.Text.Trim());
+ if (lastRst.Contains("报废"))
+ {
+ MessageBox.Show($"条码已判定为报废，不能再判定为{currentRst}.");
+ Clear();
+ return false;
+ }
+ return true;
+ }
+ ///
+ /// 合格
+ ///
+ ///
+ ///
+ private void btnOk_Click(object sender, EventArgs e)
+ {
+ try
+ {
+ if (string.IsNullOrEmpty(txtBarCode.Text.Trim()))
+ {
+ MessageBox.Show("请先扫描数据,然后操作.");
+ return;
+ }
+ #region 返喷下线数据验证
+ if (lableFP.Text.Contains("[返喷]"))
+ {
+ string barcode = txtBarCode.Text.Trim();
+ DataTable dtInspect = Function.GetInspectInfoByBarCode2(barcode);
+ if (dtInspect != null && dtInspect.Rows.Count > 0)
+ {
+ string inspectResult = dtInspect.Rows[0]["inspectResult"].ToString(); //检测结果
+ string inspectColorInfo = dtInspect.Rows[0]["remark1"].ToString(); //颜色
+ if (inspectResult.Contains("打磨"))
+ {
+ string createTime = dtInspect.Rows[0]["createTime"].ToString(); //创建时间
+ int count = 0;
+ string colorInfo = "";
+ if (_lineCode == "2")
+ {
+ count = Function.GetProducColorFromWms(barcode, "TM_BJBMPT_MES_DATA", createTime ,ref colorInfo);
+ }
+ else if (_lineCode == "1")
+ {
+ count = Function.GetProducColorFromWms(barcode, "TM_BJBMPT_MES_DATA_OLD", createTime , ref colorInfo);
+
+ }
+ else
+ {
+
+ }
+
+ if (count == 0)
+ {
+ MessageBox.Show("未发现返喷下线数据！，无法进行质量判定");
+ return;
+ }
+ else
+ {
+ if(inspectColorInfo != colorInfo)
+ {
+ btnOk.Enabled = false;
+ btnRepair.Enabled = false;
+ btnNok.Enabled = false;
+
+ MessageBox.Show("当前产品返喷颜色与原颜色不符，需报废！");
+ return;
+ }
+
+ }
+ }
+ }
+
+ }
+ #endregion
+
+ ShowHint("");
+ #region 判断产品是否有颜色
+ string colorName = string.Empty;
+ string partName = string.Empty;
+ if (CheckColor(ref colorName, ref partName) == false) return;
+
+
+ #endregion
+ ClearControlColor(SetControlGroup());
+ btnAbt.BackColor = Color.Red;
+
+ bool rr = SaveBeforeVerify("合格");
+ if (rr == false)
+ {
+ return;
+ }
+
+ //if (lastRst.Contains("合格"))
+ //{
+ // MessageBox.Show("条码已判定为合格，无需重复判定");
+ // Clear();
+ // return;
+ //}
+ SaveRst("合格", colorName, partName, 1);
+ }
+ catch(Exception ex)
+ {
+ ShowHint("执行合格判定发生异常,异常原因:" + ex.Message);
+ MessageBox.Show("执行合格判定发生异常,异常原因:" + ex.Message);
+ Clear();
+ }
+
+ }
+ void Clear()
+ {
+ ClearPage();
+ ClearTxtBarcode();
+ txtBarCode.TabIndex = 0;
+ }
+
+ ///
+ /// 其它
+ ///
+ ///
+ ///
+ private void btnNok_Click(object sender, EventArgs e)
+ {
+ try
+ {
+ if (string.IsNullOrEmpty(txtBarCode.Text.Trim()))
+ {
+ MessageBox.Show("请先扫描数据,然后操作.");
+ return;
+ }
+
+ #region 返喷下线数据验证
+ if (lableFP.Text.Contains("[返喷]"))
+ {
+ string barcode = txtBarCode.Text.Trim();
+ DataTable dtInspect = Function.GetInspectInfoByBarCode2(barcode);
+ if (dtInspect != null && dtInspect.Rows.Count > 0)
+ {
+ string inspectResult = dtInspect.Rows[0]["inspectResult"].ToString(); //检测结果
+ string inspectColorInfo = dtInspect.Rows[0]["remark1"].ToString(); //颜色
+ if (inspectResult.Contains("打磨"))
+ {
+ string createTime = dtInspect.Rows[0]["createTime"].ToString(); //创建时间
+ int count = 0;
+ string colorInfo = "";
+ if (_lineCode == "2")
+ {
+ count = Function.GetProducColorFromWms(barcode, "TM_BJBMPT_MES_DATA", createTime, ref colorInfo);
+ }
+ else if (_lineCode == "1")
+ {
+ count = Function.GetProducColorFromWms(barcode, "TM_BJBMPT_MES_DATA_OLD", createTime, ref colorInfo);
+
+ }
+ else
+ {
+
+ }
+
+ if (count == 0)
+ {
+ MessageBox.Show("未发现返喷下线数据！，无法进行质量判定");
+ return;
+ }
+ else
+ {
+ if (inspectColorInfo != colorInfo)
+ {
+ btnOk.Enabled = false;
+ btnRepair.Enabled = false;
+ btnNok.Enabled = false;
+
+ MessageBox.Show("当前产品返喷颜色与原颜色不符，需报废！");
+ return;
+ }
+
+ }
+ }
+ }
+
+ }
+ #endregion
+
+ if (MessageBox.Show($"确认对[{txtBarCode.Text}]进行[其它]判定?", "操作确认", MessageBoxButtons.OKCancel) == DialogResult.Cancel) return;
+ ShowHint("");
+ #region 必须选择缺陷位置与缺陷原因，否则无法保存
+ if (CheckDefect() == false) return;
+ #endregion
+
+ #region 判断产品是否有颜色
+ string colorName = string.Empty;
+ string partName = string.Empty;
+ if (CheckColor(ref colorName, ref partName) == false) return;
+ #endregion
+
+ int cs = Function.OtherTimes(txtBarCode.Text.Trim());
+ if (cs > 0)
+ {
+ MessageBox.Show("条码" + txtBarCode.Text.Trim() + "已存在判定为其它的记录，只允许判定1次.");
+ ShowHint("条码" + txtBarCode.Text.Trim() + "已存在判定为其它的记录，只允许判定1次.");
+ Clear();
+ return;
+ }
+
+ bool rr = SaveBeforeVerify("其它");
+ if (rr == false)
+ {
+ return;
+ }
+ SaveRst("其它", colorName, partName, 4);
+ }
+ catch(Exception ex)
+ {
+ ShowHint("执行其它判定发生异常,异常原因:" + ex.Message);
+ MessageBox.Show("执行其它判定发生异常,异常原因:" + ex.Message);
+ Clear();
+ }
+ }
+
+ ///
+ /// 返喷按钮
+ ///
+ ///
+ ///
+ private void btnRepair_Click(object sender, EventArgs e)
+ {
+ try
+ {
+ #region 可回喷次数 =1，不能打磨， =2 可以， 不能有两次质检结果为打磨
+ if (string.IsNullOrEmpty(txtBarCode.Text.Trim()))
+ {
+ MessageBox.Show("请先扫描数据,然后操作.");
+ return;
+ }
+
+ if (MessageBox.Show($"确认对[{txtBarCode.Text}]进行返喷操作?", "操作确认", MessageBoxButtons.OKCancel) == DialogResult.Cancel) return;
+ ShowHint("");
+ string barcode = Function.UniteBarCodeToOne(txtBarCode.Text.Trim());
+ int cs = Function.YiDaMoCiShu(barcode); //记录中已返喷次数
+
+ int keHuiPen = Function.keHuiPen(barcode); //基础数据中,可返喷次数
+ if (keHuiPen > 1)
+ keHuiPen = 1;
+
+ if (keHuiPen > 0 && cs < keHuiPen)
+ {
+ #region 必须选择缺陷位置与缺陷原因，否则无法保存
+
+ if (CheckDefect() == false) return;
+
+ #endregion
+
+ #region 判断产品是否有颜色
+ string colorName = string.Empty;
+ string partName = string.Empty;
+
+ if (CheckColor(ref colorName, ref partName) == false) return;
+ #endregion
+
+ ClearControlColor(SetControlGroup());
+ btnRepair.BackColor = Color.Yellow;
+
+ //string lastRst = GetLastInspectRst(txtBarCode.Text.Trim());
+ //if (lastRst.Contains("打磨"))
+ //{
+ // ShowHint("条码已判定为返喷，无需重复判定");
+ // MessageBox.Show("条码已判定为返喷，无需重复判定");
+ // Clear();
+ // return;
+ //}
+
+
+ bool rr = SaveBeforeVerify("返喷");
+ if (rr == false)
+ {
+ return;
+ }
+ SaveRst("", colorName, partName, 9);
+
+ }
+ else
+ {
+ ShowHint("根据该零件可回喷次数设置，不能判定为返喷或已超过返喷次数！");
+ MessageBox.Show("根据该零件可回喷次数设置，不能判定为返喷或已超过返喷次数！");
+ Clear();
+ return;
+ }
+
+ #endregion
+ }
+ catch(Exception ex)
+ {
+ ShowHint("执行返喷操作发生异常,异常原因:"+ex.Message);
+ MessageBox.Show("执行返喷操作发生异常,异常原因:" + ex.Message);
+ Clear();
+ }
+
+ }
+
+ ///
+ /// 报废按钮
+ ///
+ ///
+ ///
+ private void btnAbt_Click(object sender, EventArgs e)
+ {
+ try
+ {
+ if (string.IsNullOrEmpty(txtBarCode.Text.Trim()))
+ {
+ MessageBox.Show("请先扫描数据,然后操作.");
+ return;
+ }
+
+ #region 返喷下线数据验证
+ if (lableFP.Text.Contains("[返喷]"))
+ {
+ string barcode = txtBarCode.Text.Trim();
+ DataTable dtInspect = Function.GetInspectInfoByBarCode2(barcode);
+ if (dtInspect != null && dtInspect.Rows.Count > 0)
+ {
+ string inspectResult = dtInspect.Rows[0]["inspectResult"].ToString(); //检测结果
+ string inspectColorInfo = dtInspect.Rows[0]["remark1"].ToString(); //颜色
+ if (inspectResult.Contains("打磨"))
+ {
+ string createTime = dtInspect.Rows[0]["createTime"].ToString(); //创建时间
+ int count = 0;
+ string colorInfo = "";
+ if (_lineCode == "2")
+ {
+ count = Function.GetProducColorFromWms(barcode, "TM_BJBMPT_MES_DATA", createTime, ref colorInfo);
+ }
+ else if (_lineCode == "1")
+ {
+ count = Function.GetProducColorFromWms(barcode, "TM_BJBMPT_MES_DATA_OLD", createTime, ref colorInfo);
+
+ }
+ else
+ {
+
+ }
+
+ if (count == 0)
+ {
+ MessageBox.Show("未发现返喷下线数据！，无法进行质量判定");
+ return;
+ }
+ }
+ }
+
+ }
+ #endregion
+
+ // if (MessageBox.Show($"确认对[{txtBarCode.Text}]进行报废操作?", "操作确认", MessageBoxButtons.OKCancel) == DialogResult.Cancel) return;
+
+ //UserInput(userName => {
+
+ //string userName = Program.UserName;
+ // if (string.IsNullOrEmpty(userName))
+ // {
+ // MessageBox.Show("报废必须录入用户名.");
+ // return;
+ // }
+ // else
+ // {
+ ShowHint("");
+ #region 必须选择缺陷位置与缺陷原因，否则无法保存
+ if (CheckDefect() == false) return;
+ #endregion
+
+ #region 判断产品是否有颜色
+ string colorName = string.Empty;
+ string partName = string.Empty;
+ if (CheckColor(ref colorName, ref partName) == false) return;
+ #endregion
+
+ //string lastRst = GetLastInspectRst(txtBarCode.Text.Trim());
+ //if (lastRst.Contains("合格"))
+ //{
+ // MessageBox.Show("条码已判定为合格，无法重新判定为报废");
+ // Clear();
+ // return;
+ //}
+ //if (lastRst.Contains("报废"))
+ //{
+ // MessageBox.Show("条码已判定为报废，无需重复报废");
+ // Clear();
+ // return;
+ //}
+
+ ClearControlColor(SetControlGroup());
+ btnAbt.BackColor = Color.Red;
+
+ bool rr = SaveBeforeVerify("报废");
+ if (rr == false)
+ {
+ return;
+ }
+
+ SaveRst("报废", colorName, partName, 2);
+
+ // }
+ // });
+ }
+
+ catch(Exception ex)
+ {
+ ShowHint("执行报废操作发生异常,异常原因:" + ex.Message);
+ MessageBox.Show("执行报废操作发生异常,异常原因:" + ex.Message);
+ Clear();
+ }
+
+ }
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ /// 0-不合格;1-合格；9-返喷 8-其他
+ void SaveRst(string state, string colorName, string partName,int isOK,string userName="")
+ {
+ if (string.IsNullOrEmpty(userName))
+ {
+ userName = Program.UserName;
+ }
+ if (string.IsNullOrEmpty(userName))
+ {
+
+ }
+
+ if(reason.Contains("点修补") && state!="其它")
+ {
+ MessageBox.Show("选择[点修补],只能判定为[其它]状态,不能判定为"+ state);
+ return;
+ }
+ string bcode = txtBarCode.Text.Trim();
+
+ bool ispass = ScanCodeValidVerify(bcode);
+ if (ispass == false)
+ {
+ txtBarCode.SelectAll();
+ return;
+ }
+
+
+
+ //保存
+ string id = SaveInspect(state, colorName, partName, userName);
+
+ try
+ {
+ if (!string.IsNullOrEmpty(id))
+ {
+ string interfaceMsg = string.Empty;
+ bool rst = SendToWms(txtBarCode.Text.Trim(), isOK,ref interfaceMsg);
+ if (rst == false)
+ {
+ DeleteRepectRst(id, "Web接口调用返回false,原因:" + interfaceMsg, bcode);
+ }
+ else
+ {
+ ShowHint(txtBarCode.Text.Trim()+"操作成功",true);
+ Clear();
+ }
+ }
+ else
+ {
+ MessageBox.Show("质检记录保存失败,请重新操作.");
+ return;
+ }
+
+ }
+ catch (Exception ex)
+ {
+ if (ex.Message.Contains("WMS"))
+ {
+ DeleteRepectRst(id,"Web接口调用抛出异常,异常原因:" + ex.Message , bcode);
+ }
+ ShowHint(state+"-WMS报工异常,原因:" + ex.Message);
+ MessageBox.Show(state+"-WMS报工异常,原因:" + ex.Message);
+ LogHelper.WriteLog(state+"-WMS报工调用WMS接口：" + ex.ToString(), MethodBase.GetCurrentMethod().Name);
+ }
+ }
+ private void DeleteRepectRst(string id,string msg,string oneBarCode)
+ {
+ Function.DelInspectRst(id);
+ LogHelper.WriteLog($"接口异常,删除塑件[{oneBarCode}]喷涂质检记录,异常内容:" + msg, MethodBase.GetCurrentMethod().Name);
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ string GetLastInspectRst(string barCode)
+ {
+ DataTable inspectTable = Function.GetInspectInfoByBarCode2(txtBarCode.Text.Trim());
+ if (inspectTable.Rows.Count > 0)
+ {
+ return inspectTable.Rows[0]["inspectResult"].ToString();
+ }
+ return "";
+ }
+
+ ///
+ /// 发送wms罢工
+ ///
+ ///
+ /// 0:报废 1:合格 9:返喷
+ bool SendToWms(string scanBarCode, int isOk,ref string errorMsg)
+ {
+ try
+ {
+ if (_isTest == "true")
+ return true;
+
+ //WMSWebService webService = new WMSWebService();
+ //webService.Url = ConfigurationManager.AppSettings["WMSWebServiceURL"].ToString();
+ ////webService.Timeout = 1200000;
+ //string errorReason = "";
+ ////上次异常提交
+ //if (_lastJustDict.Count > 0)
+ //{
+ // bool rst2 = webService.WMSSprayingForCS(Function.UniteBarCodeToOne(_lastJustDict.First().Key), int.Parse(_lastJustDict.First().Value), out errorReason);
+ //}
+
+
+ //bool rst = webService.WMSSprayingForCS(Function.UniteBarCodeToOne(scanBarCode), isOk, out errorReason);
+ //if (rst == false)
+ //{
+
+ // MessageBox.Show("调用远程接口失败");
+ // ShowHint("调用远程接口失败: " + errorReason);
+
+ // _lastJustDict.Clear();
+ // _lastJustDict.Add(scanBarCode, isOk.ToString());
+
+ // return false;
+ //}
+ //_lastJustDict.Clear();
+ return true;
+ }
+ catch(Exception ex)
+ {
+ throw new Exception("WMS接口调用异常,异常原因:" + ex.Message);
+ }
+
+ }
+ ///
+ /// 判断产品是否有颜色
+ ///
+ ///
+ bool CheckColor(ref string colorName,ref string partName)
+ {
+ string[] ss = null;
+ if (string.IsNullOrEmpty(labProductInfo.Text))
+ {
+ MessageBox.Show("颜色信息有误，请重新扫描");
+ return false;
+ }
+ if (labProductInfo.Text.Contains("，"))
+ {
+ ss = labProductInfo.Text.Split('，');
+ }
+ else
+ {
+ ss = labProductInfo.Text.Split(',');
+ }
+ if (ss.Length >= 1)
+ {
+ if (string.IsNullOrWhiteSpace(ss[0]))
+ {
+ MessageBox.Show("无颜色信息，请重新扫描");
+ return false;
+ }
+ }
+ else
+ {
+ MessageBox.Show("颜色信息有误1，请重新扫描");
+ return false;
+ }
+ colorName = ss[0];
+ if (ss.Length > 1)
+ {
+ if (!string.IsNullOrEmpty(ss[1]))
+ {
+ partName = ss[1];
+ }
+ }
+ return true;
+ }
+ ///
+ /// 必须选择缺陷位置与缺陷原因，否则无法保存
+ ///
+ ///
+ bool CheckDefect()
+ {
+ string damnPositionTemp = "";
+ string reasonTemp = "";
+ //缺陷位置
+ foreach (Control c in pictureBox2.Controls)
+ {
+ Label lab = c as Label;
+ if (lab.BackColor != Color.Transparent)
+ {
+ damnPositionTemp += lab.Text + ";";
+ position = damnPositionTemp;
+ }
+ }
+ //缺陷原因
+ foreach (Control c in panel2.Controls)
+ {
+ Label lab = c as Label;
+ if (lab.BackColor != Color.Transparent)
+ {
+ reasonTemp += lab.Text + ";";
+ reason = reasonTemp;
+ }
+ }
+
+ if (string.IsNullOrWhiteSpace(damnPositionTemp) || string.IsNullOrWhiteSpace(reasonTemp))
+ {
+ MessageBox.Show("必须选择缺陷位置与缺陷原因，否则无法保存！");
+ return false;
+ }
+ return true;
+ }
+ ///
+ /// 保存质检记录 tb_InspectResult
+ ///
+ ///
+ ///
+ ///
+ /// 返回插入记录的ID
+ public string SaveInspect(string inspectResult,string colorName, string partName,string userName)
+ {
+ try
+ {
+
+ return "";
+ }
+ catch (Exception ex)
+ {
+ ShowHint("质检提交异常,原因:" + ex.Message);
+ LogHelper.WriteLog("质检提交：" + ex.ToString(), MethodBase.GetCurrentMethod().Name);
+ MessageBox.Show("质检提交异常,原因:" + ex.Message);
+ return null;
+ }
+ }
+ void ShowHint(string txt,bool isOk =false)
+ {
+ lbForeig.ForeColor = Color.Red;
+ lbForeig.Text = txt;
+ if(isOk == true)
+ {
+ lbForeig.ForeColor = Color.Green;
+ }
+ }
+ public void ClearInspect()
+ {
+ //缺陷位置
+ foreach (Control c in pictureBox2.Controls)
+ {
+ Label lab = c as Label;
+ lab.BackColor = Color.Transparent;
+ }
+ //缺陷原因
+ foreach (Control c in panel2.Controls)
+ {
+ Label lab = c as Label;
+ lab.BackColor = Color.Transparent;
+ }
+ }
+
+ ///
+ /// 扫码-根据条码查询信息（产品信息、加载图片及缺陷原因、三次检验信息）
+ ///
+ ///
+ ///
+ private void txtBarCode_KeyDown(object sender, KeyEventArgs e)
+ {
+ if (e.KeyCode == Keys.Enter)
+ {
+ try
+ {
+ btnOk.Enabled = true;
+ btnRepair.Enabled = true;
+ btnNok.Enabled = true;
+
+ lbForeig.Text = "";
+ ClearPage();
+ if (string.IsNullOrEmpty(lbPlanCode.Text))
+ {
+ throw new Exception("当前没有生产计划.");
+ }
+ ScanBarCode();
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show("请查看网络是否与服务器连通，无法连通请联系网络管理员。"+ ex);
+ LogHelper.WriteLog(ex.ToString(), MethodBase.GetCurrentMethod().Name);
+ }
+ }
+ }
+
+ private void ScanBarCode()
+ {
+ try
+ {
+ ButtonEnable(SetControlGroup());
+ //ClearPage();
+
+ string barcode = txtBarCode.Text.Trim();
+ if (barcode.Contains("."))
+ {
+ barcode = Function.TransToBarCodeOne(barcode);
+ }
+
+ #region 判断条码有效性
+
+ if (! Function.BarCodeValid(barcode))
+ {
+ MessageBox.Show("扫描的条码号："+barcode+"无效，请重新扫描！");
+ txtBarCode.Text = "";
+ return;
+ }
+ //bool ispass = ScanCodeValidVerify(barcode);
+ //if (ispass == false)
+ //{
+ // txtBarCode.SelectAll();
+ // return;
+ //}
+
+ DataTable stockInTable = Function2.SearchStockIn(barcode);
+ if(stockInTable.Rows.Count == 0)
+ {
+ ShowHint("扫描半成品码没有喷涂完工记录,无法使用.",false);
+ return;
+ }
+
+ DataTable punchTable = Function2.SearchPunchCodeRecord(barcode);
+ if(punchTable.Rows.Count > 0)
+ {
+ if(punchTable.Rows[0]["Flag"].ToString() == "0" || punchTable.Rows[0]["Flag"].ToString() == "1")
+ {
+ ShowHint("扫描半成品码已存在装配记录,无法使用.", false);
+ return;
+ }
+ }
+ DataTable productTable = Function2.GetProductInfo(barcode.Substring(0, 10));
+ if(productTable.Rows.Count == 0)
+ {
+ ShowHint($"扫描半成品码的存货代码[{barcode.Substring(0, 10)}]在零件表找不对对应零件号,请检查系统维护.", false);
+ return;
+ }
+ string asselblePartCode = Function2.GetAssemblePartCode(productTable.Rows[0]["PartNo"].ToString(), _stationNo);
+
+ if(lbProductCode.Text?.ToLower() != asselblePartCode?.ToLower())
+ {
+ ShowHint($"扫描半成品码在BOM中对应的总成零件号[{asselblePartCode}]与当前计划的零件号[{lbProductCode.Text}]不匹配.", false);
+ return;
+ }
+
+ DataTable bomTable = Function2.GetBomTable(asselblePartCode, _stationNo);
+ List list = bomTable.AsEnumerable().Where(p => p.Field("IsChecked") == 1).ToList();
+
+
+ #endregion
+
+
+
+
+ #region 如果是补打的条码，查询产品信息
+
+ //if (!barcode.Contains(".") && barcode.Length > 4)
+ //{
+ // string strCode = barcode.Substring(barcode.Length - 4, 4);
+ // int num = 0;
+ // Int32.TryParse(strCode, out num);
+ // if (num > 7000)
+ // {
+ // labProductInfo.Text = Function.GetReprintInfo2(barcode);
+ // if (string.IsNullOrWhiteSpace(labProductInfo.Text.Trim()))
+ // {
+ // ButtonDisable(SetControlGroup());
+ // labProductInfo.Text = "没有查询到补打条码信息";
+ // return;
+ // }
+ // }
+
+ //}
+
+ #endregion
+
+ //根据条码查询，加载图片及原因
+ int row = 0, col = 0;
+ string picture = "";
+
+ #region 缺陷原因
+
+ try
+ {
+ int drow = 0, dcol = 5; //行，列
+
+ DataTable dt3 = Function.SearchDefectInfo(ConfigurationManager.AppSettings["Station"].Trim());
+ if (dt3 != null && dt3.Rows.Count > 0)
+ {
+ drow = Convert.ToInt32(Math.Ceiling((double)dt3.Rows.Count / dcol));
+ Label[] dLb = new Label[7];
+ string[] dstr = new string[dt3.Rows.Count];
+
+ for (int i = 0; i < dt3.Rows.Count; i++)
+ {
+ dstr[i] = dt3.Rows[i]["DefectName"].ToString();
+ }
+
+ for (int i = 0; i < dcol; i++) //列
+ {
+ for (int j = 0; j < drow; j++) //行
+ {
+ dLb[i] = new Label();
+ if ((i + dcol * j) < dstr.Length)
+ {
+
+ dLb[i].Text = dstr[i + dcol * j].ToString();
+ dLb[i].Font = new Font(dLb[i].Font.FontFamily, 24, FontStyle.Bold);
+ dLb[i].Size = new Size(150, 50);
+ dLb[i].Location = new Point(20 + i * (dLb[i].Size.Width + 25), 5 + j * (dLb[i].Size.Height + 20));
+ dLb[i].BorderStyle = BorderStyle.FixedSingle;
+ dLb[i].BackColor = Color.Transparent;
+ dLb[i].TextAlign = ContentAlignment.MiddleCenter;
+
+ if (dLb[i].Text.Contains("点修补"))
+ {
+ dLb[i].Font = new Font(dLb[i].Font.FontFamily, 36, FontStyle.Bold);
+ dLb[i].Size = new Size(170, 60);
+ dLb[i].ForeColor = Color.Red;
+ //dLb[i].BackColor = Color.Red;
+ }
+ panel2.Controls.Add(dLb[i]);
+ dLb[i].Click += new EventHandler(dLbRoom_Click);
+ }
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ LogHelper.WriteLog("缺陷项-"+ex.ToString(), MethodBase.GetCurrentMethod().Name);
+ throw ex;
+ }
+
+ #endregion
+
+ #region 加载图片
+
+ try
+ {
+ DataTable dt2 = Function.SearchInfoByBarCode(barcode);
+
+ if (dt2 != null && dt2.Rows.Count > 0)
+ {
+ row = Convert.ToInt32(dt2.Rows[0]["Rows"].ToString());
+ col = Convert.ToInt32(dt2.Rows[0]["Cols"].ToString());
+ picture = dt2.Rows[0]["PicturePath"].ToString();
+ }
+ dt2.Dispose();
+
+ if (!string.IsNullOrEmpty(picture))
+ {
+ if (!File.Exists(System.IO.Directory.GetCurrentDirectory() + @"\" + picture))
+ {
+
+ string strImageURL = Function.GetImgPath() + picture;
+
+ if(_isTest != "true")
+ {
+ System.Net.WebClient webClient = new System.Net.WebClient();
+ webClient.DownloadFile(strImageURL, Directory.GetCurrentDirectory() + @"\" + picture);
+ }
+
+ }
+
+
+ FileStream fs = new FileStream(Directory.GetCurrentDirectory() + "\\" + picture, FileMode.Open,
+ FileAccess.Read);//获取图片文件流
+ Image img = Image.FromStream(fs); // 文件流转换成Image格式
+ pictureBox2.Image = img; //给 图片框设置要显示的图片
+ fs.Close(); // 关闭流，释放图片资源
+ }
+ }
+ catch (Exception ex)
+ {
+ LogHelper.WriteLog("图片项-" + ex.ToString(), MethodBase.GetCurrentMethod().Name);
+ }
+ #endregion
+
+ #region 缺陷图划分区域
+
+ Label[] lb = new Label[5];
+ string[] str = { "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z" };
+
+ for (int i = 0; i < col; i++)
+ {
+ for (int j = 0; j < row; j++)
+ {
+ lb[i] = new Label();
+ lb[i].Text = str[i + col * j].ToString();
+ lb[i].Font = new Font(lb[i].Font.FontFamily, 32, FontStyle.Bold);
+
+ lb[i].Size = new Size(pictureBox2.Width / col, pictureBox2.Height / row);
+ lb[i].Location = new Point(0 + i * lb[i].Size.Width, 0 + j * lb[i].Size.Height);
+ lb[i].BorderStyle = BorderStyle.FixedSingle;
+ lb[i].BackColor = Color.Transparent;
+ lb[i].TextAlign = ContentAlignment.MiddleCenter;
+ pictureBox2.Controls.Add(lb[i]);
+
+ lb[i].Click += new EventHandler(lblRoom_Click);
+ }
+ }
+
+ #endregion
+
+ //不是补打的条码，根据条码查询产品信息、检验信息，选中缺陷位置及原因
+ DataTable dtInspect = Function.GetInspectInfoByBarCode2(barcode);
+ if (dtInspect != null && dtInspect.Rows.Count > 0)
+ {
+ //List list = dtInspect.AsEnumerable().Where(p => p.Field("inspectResult").Contains("打磨")).ToList();
+ //string state = string.Empty;
+ //if (list.Count > 0)
+ //{
+ // state = "返喷";
+ //}
+ //List list2 = dtInspect.AsEnumerable().Where(p => p.Field("inspectResult").Contains("其它")).ToList();
+ //if (list2.Count > 0)
+ //{
+ // if(list2.Where(p=> p.Field("inspectResult")=="其它WMS").Count() > 0)
+ // {
+ // state = state + ",其它WMS";
+ // }
+ // if (list2.Where(p => p.Field("inspectResult") == "其它").Count() > 0)
+ // {
+ // state = state + ",其它";
+ // }
+
+ //}
+
+ //if (!string.IsNullOrEmpty(state))
+ //{
+ // lableFP.Text = "存在[" + state + "]状态";
+ //}
+
+ //_carType = dtInspect.Rows[0]["CarType"].ToString().Trim();
+ //labProductInfo.Text = dtInspect.Rows[0]["productInfo"].ToString().Trim(); //产品信息
+ ////string position1 = dtInspect.Rows[0]["damnPosition"].ToString(); //缺陷位置
+ ////string reason1 = dtInspect.Rows[0]["reason"].ToString(); //原因
+ //position= dtInspect.Rows[0]["damnPosition"].ToString(); //缺陷位置
+ //reason= dtInspect.Rows[0]["reason"].ToString(); //原因
+
+
+
+ //paintId = dtInspect.Rows[0]["remark3"].ToString(); //原因
+
+ //string stationNo = dtInspect.Rows[0]["stationNo"].ToString(); //质检工位
+ //if(!_stations.Contains(stationNo))
+ //{
+
+ // //ShowHint(em, false);
+ // txtBarCode.Text = "";
+ // txtBarCode.TabIndex = 0;
+ // txtBarCode.Select();
+ // return;
+ //}
+
+ //#region 选中缺陷位置及原因
+
+ //foreach (Control c in pictureBox2.Controls)
+ //{
+ // Label lab = c as Label;
+ // if (position.Contains(lab.Text))
+ // {
+ // lab.BackColor = Color.FromArgb(150, System.Drawing.Color.Chartreuse);
+ // count++;
+ // }
+ //}
+ //foreach (Control c in panel2.Controls)
+ //{
+ // Label lab = c as Label;
+ // if (reason.Contains(lab.Text))
+ // {
+ // lab.BackColor = Color.Chartreuse;
+ // reason += lab.Text + ";";
+ // }
+ //}
+
+ //#endregion
+
+ #region 根据一检结果显示一检时的位置--暂时不要
+
+ labProPosition.Text = Function.GetFirstInsPosition2(dtInspect);
+
+ #endregion
+ }
+ else
+ {
+
+ #region 没有一检结果，查询老外数据库，取产品信息
+ if ((_isSingleStation==true ))
+ {
+ string paintError = string.Empty;
+ //喷涂线边质检,没有质检结果,查询老外数据库，取产品信息
+ string foreignVal = string.Empty;
+ if(_lineCode == "2")
+ {
+ foreignVal = Function.GetProductInfoFrWms(barcode, "TM_BJBMPT_MES_DATA", ref paintError);
+ }
+ else if (_lineCode == "1")
+ {
+ foreignVal = Function.GetProductInfoFrWms(barcode, "TM_BJBMPT_MES_DATA_OLD", ref paintError);
+
+ }
+ else
+ {
+ foreignVal = Function.GetProductInfo2(barcode, ref paintError);
+ }
+ if (!string.IsNullOrEmpty(paintError))
+ {
+ lbForeig.Text = paintError;
+ }
+ if (string.IsNullOrEmpty(foreignVal))
+ {
+ return;
+ }
+ string[] info = foreignVal.Split('，');
+ if (!string.IsNullOrEmpty(paintError))
+ {
+ ShowHint(paintError);
+ }
+ _foreighColor = info[0];
+ labProductInfo.Text = info[0] + "，" + info[1];
+ paintId = info[2];
+ labProPosition.Tag = paintId;
+ labProductInfo.Tag = Function.GetSide(barcode, paintId);
+ labProPosition.Text = labProductInfo.Tag.ToString().Replace(';', ' ');
+ if (info.Length == 4)
+ {
+ _foreignPartCode = info[3];
+ }
+ }
+ else
+ {
+ //库房返喷,没有质检结果,不能查老外库,就是条码不正确
+ MessageBox.Show("没有喷涂线边质检记录,无法返喷操作!");
+ txtBarCode.Text = "";
+ txtBarCode.TabIndex = 0;
+ txtBarCode.Select();
+ return ;
+ }
+
+
+ #endregion
+ }
+
+
+ txtBarCode.SelectAll();
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show("请查看网络是否与服务器连通，无法连通请联系网络管理员。" + ex.ToString());
+ LogHelper.WriteLog("整体项-" + ex.ToString(), MethodBase.GetCurrentMethod().Name);
+ }
+ }
+ ///
+ /// 一检 二检 点修补扫码是否允许验证
+ ///
+ ///
+ ///
+ private bool ScanCodeValidVerify(string barcode)
+ {
+ //string position = _stationType;
+ // switch (position)
+ // {
+ // case "下线一检": return First(barcode);
+ // case "下线二检": return Second(barcode);;
+ // case "下线点修补": return Third(barcode);
+ // default:return true;
+
+ // }
+ return true;
+
+ }
+
+ private bool First(string barcode)
+ {
+ if(_isSingleStation == true)
+ {
+ ShowHint("当前系统配置为[单工位生产],无法在此工位扫码,请去终检工位进行操作.", false);
+ return false;
+ }
+
+ DataTable dt = Function.GetLastResult(barcode);
+ if (dt.Rows.Count > 0)
+ {
+ ShowHint("扫描条码["+ barcode + "]已存在质检记录,无法在[下线一检]工位进行重新扫码." , false);
+ return false;
+ }
+ return true;
+ }
+
+ private bool Second(string barcode)
+ {
+ DataTable dt = Function.GetLastResult(barcode);
+ if (_isSingleStation == false)
+ {
+ if (dt.Rows.Count == 0)
+ {
+ ShowHint("扫描条码[" + barcode + "]不存在[下线一检]记录,无法在[下线二检]工位进行扫码.", false);
+ return false;
+ }
+
+ DataRow dr = dt.Rows[0];
+ if (dr["reason"].ToString().Contains("点修补") && dr["inspectResult"].ToString().Contains("其它"))
+ {
+ ShowHint("扫描条码[" + barcode + "]上次质量判定为[点修补],无法进行二检扫码.", false);
+ return false;
+ }
+ if (dr["inspectResult"].ToString().Contains("报废"))
+ {
+ ShowHint("上次质量判定为[报废],无法进行二检扫码.", false);
+ return false;
+ }
+ }
+
+
+ return true;
+ }
+
+ ///
+ /// 点修补扫码校验
+ ///
+ ///
+ ///
+ private bool Third(string barcode)
+ {
+ string errorMsg = string.Empty;
+ bool isExsit = Function. GetPointRepairFrWms(barcode, ref errorMsg);
+ if(isExsit == false)
+ {
+ if (!string.IsNullOrEmpty(errorMsg))
+ {
+ ShowHint("在wms系统的查询返修入库记录时发生错误,错误原因:"+errorMsg, false);
+ return false;
+
+ }
+ else{
+ ShowHint("没有在wms系统的返修入库记录,无法进行点修补.", false);
+ return false;
+ }
+
+ }
+ DataTable dt = Function.GetLastResult(barcode);
+ if (dt.Rows.Count > 0)
+ {
+ if(dt.Rows[0]["reason"].ToString().Contains("点修补") && dt.Rows[0]["inspectResult"].ToString().Contains("其它"))
+ {
+ return true;
+ }
+ else
+ {
+ ShowHint("必须上次质量判定记录为点修补,类型为其它,才能在当前[点修补]工位扫码.", false);
+ return false;
+ }
+ }
+ else
+ {
+ ShowHint("没有初始质量判定记录,无法在[点修补]工位扫码.", false);
+ return false;
+ }
+
+
+
+ }
+
+ ///
+ /// 设置按钮不可用
+ ///
+ ///
+ private void ButtonDisable(Control[] controls)
+ {
+ foreach (Control c in controls)
+ {
+ Button btn = c as Button;
+ btn.Enabled = false;
+ }
+ }
+
+ ///
+ /// 设置按钮可用
+ ///
+ ///
+ private void ButtonEnable(Control[] controls)
+ {
+ foreach (Control c in controls)
+ {
+ Button btn = c as Button;
+ btn.Enabled = true;
+ }
+ }
+
+ private void labWorkClass_Click(object sender, EventArgs e)
+ {
+ Function.ChangeWorkClass(labWorkClass);
+ }
+
+ ///
+ /// 点击退出
+ ///
+ ///
+ ///
+ private void labTime_Click(object sender, EventArgs e)
+ {
+ Environment.Exit(0);
+ }
+
+ ///
+ /// 清空页面
+ ///
+ private void ClearPage()
+ {
+ labProductInfo.Tag = null;
+ labProductInfo.Text = "";
+ //btnAbt.BackColor = Color.LightGray;
+ //btnRepair.BackColor = Color.LightGray;
+
+ //ClearRadioButton();
+ ClearInspect();
+ ClearControlColor(SetControlGroup());
+ pictureBox2.Controls.Clear();
+ panel2.Controls.Clear();
+ pictureBox2.Image = null;
+ txtBarCode.TabIndex = 0;
+ txtBarCode.Select();
+ position = "";
+ reason = "";
+ lableFP.Text = "";
+ _foreighColor = "";
+ _foreignPartCode = "";
+ _carType = string.Empty;
+ }
+
+ public void ClearRadioButton()
+ {
+ groupBox1.Controls.Clear();
+ }
+
+ public void ClearTxtBarcode()
+ {
+ txtBarCode.Text = "";
+ labProPosition.Text = "";
+ }
+
+ public void LoadScreen()
+ {
+ DataTable dt = Function2.GetProScreen(_stationNo);
+ if (dt != null && dt.Rows.Count > 0)
+ {
+ SetPage(dt);
+ }
+
+ }
+ private void SetPage(DataTable dt)
+ {
+ IsHigh = "1";
+ lbPlanCode.Text = "";
+ lbProductCode.Text = "";
+ lbProductName.Text = "";
+
+
+ if (dt != null && dt.Rows.Count > 0)
+ {
+ lbPlanCode.Text = dt.Rows[0]["OrderNo"].ToString();
+ lbPlanCode.Tag = dt.Rows[0]["ID"].ToString();
+ lbProductName.Text = dt.Rows[0]["ProductName"].ToString();
+ lbProductCode.Text = dt.Rows[0]["PartNo"].ToString();
+
+ SetProduceCount(dt.Rows[0]);
+ }
+
+ }
+ ///
+ /// 设置生产数量
+ ///
+ ///
+ void SetProduceCount(DataRow planRow)
+ {
+ int planQty = 0;
+ int okQty = 0;
+ int badQty = 0;
+ int repairQty = 0;
+
+ int.TryParse(planRow["OrderCount"].ToString(), out planQty);
+ int.TryParse(planRow["OKCount"].ToString(), out okQty);
+ int.TryParse(planRow["BadCount"].ToString(), out badQty);
+ int.TryParse(planRow["RepairCount"].ToString(), out repairQty);
+ lbPlanQty.Text = planQty.ToString();
+ lbPlanCompleteQty.Text = (okQty+ badQty).ToString();
+ lbOkCount.Text = okQty.ToString();
+ lbRepairCount.Text = repairQty.ToString();
+ lbBadCount.Text = badQty.ToString();
+ }
+
+ private void btnPlanUp_Click(object sender, EventArgs e)
+ {
+ LoadPlanScreen(lbPlanCode.Tag?.ToString(), "上一计划");
+ txtBarCode.Select();
+ txtBarCode.Focus();
+ }
+
+ private void btnPlanDown_Click(object sender, EventArgs e)
+ {
+ LoadPlanScreen(lbPlanCode.Tag?.ToString(), "下一计划");
+ txtBarCode.Select();
+ txtBarCode.Focus();
+ }
+ public void LoadPlanScreen(string id, string plan)
+ {
+
+ DataTable dt = Function2.GetProScreenPlan(id, _stationNo, plan);
+ if (dt != null && dt.Rows.Count > 0)
+ {
+ SetPage(dt);
+ }
+ else
+ {
+ if (plan == "下一计划")
+ {
+ MessageBox.Show("无下一计划");
+ txtBarCode.SelectAll();
+ txtBarCode.Focus();
+ }
+ else
+ {
+ MessageBox.Show("无上一计划");
+ txtBarCode.SelectAll();
+ txtBarCode.Focus();
+ }
+ }
+ txtBarCode.SelectAll();
+ txtBarCode.Focus();
+ }
+
+ private void txtBarCode_DoubleClick(object sender, EventArgs e)
+ {
+ txtBarCode.SelectAll();
+ }
+
+ }
+}
diff --git a/PunchingMistake/FrmQualityNew1.resx b/PunchingMistake/FrmQualityNew1.resx
new file mode 100644
index 0000000..3d1eb78
--- /dev/null
+++ b/PunchingMistake/FrmQualityNew1.resx
@@ -0,0 +1,475 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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
+
+
+
+
+ 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
+ RK5CYII=
+
+
+
\ No newline at end of file
diff --git a/PunchingMistake/Function2.cs b/PunchingMistake/Function2.cs
index 4161966..71ef956 100644
--- a/PunchingMistake/Function2.cs
+++ b/PunchingMistake/Function2.cs
@@ -1,9 +1,11 @@
using DBUtility;
+using PaintingPC.Model;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Text;
+using System.Text.RegularExpressions;
using System.Threading.Tasks;
namespace PunchingMistake
@@ -111,7 +113,10 @@ namespace PunchingMistake
order by CreateTime asc
";
res = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null);
-
+ if (res.Rows.Count > 0)
+ {
+ UpdatePlanState2(res.Rows[0]["ID"].ToString(), stationNo);
+ }
#endregion
}
else if (plan == "上一计划")
@@ -149,7 +154,10 @@ namespace PunchingMistake
order by CreateTime asc
";
res = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null);
-
+ if (res.Rows.Count > 0)
+ {
+ UpdatePlanState2(res.Rows[0]["ID"].ToString(), stationNo);
+ }
#endregion
}
@@ -167,6 +175,10 @@ namespace PunchingMistake
where a.ID='" + id + @"'
";
res = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null);
+ if (res.Rows.Count > 0)
+ {
+ UpdatePlanState2(res.Rows[0]["ID"].ToString(), stationNo);
+ }
}
return res;
@@ -177,7 +189,40 @@ namespace PunchingMistake
return res;
}
}
-
+ static int UpdatePlanState2(string planID,string stationNo)
+ {
+ int res = 0;
+ try
+ {
+ string sql1 = @" update tb_ZP_MK_Plan set State = '2' where State = 1 and Station='" + stationNo + "' ";
+ string sql2 = @" update tb_ZP_MK_Plan set State = '1' where ID='" + planID + "' ";
+ res = SqlHelper.ExecuteNonQuery(SqlHelper.SqlConnString, CommandType.Text, sql1, null);
+ res = SqlHelper.ExecuteNonQuery(SqlHelper.SqlConnString, CommandType.Text, sql2, null);
+ return res;
+ }
+ catch (Exception ex)
+ {
+ LogHelper.WriteLog("切换计划时,更新计划状态失败[UpdatePlanState2],失败原因:"+ex.Message);
+ //LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name);
+ return res;
+ }
+ }
+ public static int DeleteLineData(string id )
+ {
+ int res = 0;
+ try
+ {
+ string sql1 = @" delete from tb_Punch_Line where ID='" + id + "' ";
+ res = SqlHelper.ExecuteNonQuery(SqlHelper.SqlConnString, CommandType.Text, sql1, null);
+ return res;
+ }
+ catch (Exception ex)
+ {
+ LogHelper.WriteLog("扫码生产完成,删除操作临时数据失败,[DeleteLineData],失败原因:" + ex.Message);
+ //LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name);
+ return res;
+ }
+ }
///
/// 塑件码是否通过了Wms报工
///
@@ -220,7 +265,7 @@ namespace PunchingMistake
DataTable res = new DataTable();
try
{
- string sql = $" select Top 1 * from tb_Product where StockNo='{stockNo}' order by id desc ";
+ string sql = $" select Top 1 * from tb_Product where StockNo='{stockNo}' ";
res = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null);
return res;
}
@@ -230,6 +275,25 @@ namespace PunchingMistake
return res;
}
}
+ public static string GetProductName(string partNo)
+ {
+ DataTable res = new DataTable();
+ try
+ {
+ string sql = $" select Top 1 * from tb_Product where PartNo='{partNo}' ";
+ res = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null);
+ if (res.Rows.Count > 0)
+ {
+ return res.Rows[0]["ProductName"].ToString();
+ }
+ return "";
+ }
+ catch (Exception ex)
+ {
+ LogHelper.WriteLog("通过零件号查询零件名称,tb_Product表发生异常,异常原因:" + ex.ToString());
+ return "";
+ }
+ }
///
/// 半成品条码,找总成条码
///
@@ -241,7 +305,7 @@ namespace PunchingMistake
DataTable res = new DataTable();
try
{
- string sql = $" select Top 1 * from tb_Bom_MK where PartNo2='{partCode}' and IsPartAssemble=1 and StationNo='{stationNo}' order by id desc ";
+ string sql = $" select Top 1 * from tb_Bom_MK where PartNo2='{partCode}' and IsPartAssemble=1 and StationNo='{stationNo}' ";
res = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null);
if(res .Rows.Count > 1)
@@ -268,7 +332,7 @@ namespace PunchingMistake
DataTable res = new DataTable();
try
{
- string sql = $" select Top 1 * from tb_Bom_MK where PartNo1='{assemblePartCode}' and StationNo='{stationNo}' order by id desc ";
+ string sql = $" select * from tb_Bom_MK where PartNo1='{assemblePartCode}' and StationNo='{stationNo}' ";
res = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null);
return res;
@@ -301,26 +365,26 @@ namespace PunchingMistake
}
}
- public static int SavePartAndProduct_New(string barcode, string BcpID, string ZcID, string OrderNo, string WorkClass, string planID, string SerialNo, string barCode1, string barCode2, string barCode3, string barCode4, string barCode5, string barCode6, string stationId, string description)
+ public static int SavePartAndProduct_New(string barcode, string partNo1, string partNo2, string ZcID, string OrderNo, string WorkClass, string planID, string SerialNo, string barCode1, string barCode2, string barCode3, string barCode4, string barCode5, string barCode6, string stationId, string description)
{
int res = 0;
try
{
string sql = @"
INSERT INTO [dbo].[tb_Punch_Code_Record]
- ([ID]
- ,[barcode]
+ ([barcode]
,[BcpID]
- ,[ZcID]
+ ,ZcPartNo
+ ,[ZcBarCode]
,[OrderNo]
,[WorkClass]
,[CreateTime], PlanID,SerialNo
,barCode1,barCode2,barCode3
- ,barCode4,barCode5,barCode6,StationId,StationDescription)
+ ,barCode4,barCode5,barCode6,StationNo,StationDescription)
VALUES
- ((select newid())
- ,'" + barcode + @"'
- ,'" + BcpID + @"'
+ ('" + barcode + @"'
+ ,'" + partNo2 + @"'
+ ,'" + partNo1 + @"'
,'" + ZcID + @"'
,'" + OrderNo + @"'
,'" + WorkClass + @"'
@@ -379,7 +443,7 @@ namespace PunchingMistake
int res = 0;
try
{
- string sql = " update tb_Plan_Punch set CompleteCount = CompleteCount + 1 where ID = '" + ID + "' ";
+ string sql = " update tb_ZP_MK_Plan set OKCount = OKCount + 1 where ID = '" + ID + "' ";
res = SqlHelper.ExecuteNonQuery(SqlHelper.SqlConnString, CommandType.Text, sql, null);
return res;
}
@@ -419,6 +483,177 @@ namespace PunchingMistake
return res;
}
}
+
+ static string GetPartNoFromBarCode(string pBarCode)
+ {
+ if (pBarCode.Length == 33 || pBarCode.Length == 31)
+ {
+
+ string color = pBarCode.Substring(19, 3);
+ if (Regex.IsMatch(color, "^[0-9]+$") == true) //三位全是数字,认为不含颜色
+ {
+ pBarCode = pBarCode.Substring(6, 13);
+ }
+ else
+ {
+ pBarCode = pBarCode.Substring(6, 16);
+ }
+ }
+ else if (pBarCode.Length == 28)
+ {
+ pBarCode = pBarCode.Substring(6, 13);
+ }
+ else if (pBarCode.Length == 24)
+ {
+ pBarCode = pBarCode.Substring(0, 13);
+ }
+ else
+ {
+ if (pBarCode.Length > 10)
+ {
+ if (pBarCode.Contains("."))
+ {
+ pBarCode = pBarCode.Substring(0, pBarCode.IndexOf("."));
+ }
+ else if (pBarCode.Contains("/"))
+ {
+ pBarCode = pBarCode.Substring(0, pBarCode.IndexOf("/"));
+ }
+ else if (pBarCode.Length == 11)
+ {
+ pBarCode = pBarCode;
+ }
+ else
+ {
+ pBarCode = pBarCode.Substring(0, 10);
+ }
+ }
+ }
+ return pBarCode;
+ }
+
+ public static string GetProductNo(string barcode)
+ {
+ string res = "";
+ try
+ {
+ if (barcode.Length != 20)
+ {
+ return GetPartNoFromBarCode(barcode);
+ }
+
+
+ //LogHelper.WriteSysLogBase("[一码到底]扫入条码：" + barcode, MethodBase.GetCurrentMethod().Name);
+ //if (barcode.Length != 20)
+ //{
+ // barcode = UniteBarCodeToOne(barcode);
+ //}
+
+ string sql = @" select top 1 paintCode from tb_StockIn where barcode = '" + barcode + @"' ";
+ object aa = SqlHelper.ExecuteScalar(SqlHelper.SqlConnString, CommandType.Text, sql, null);
+ if (aa != null)
+ res = aa.ToString();
+
+ if (string.IsNullOrEmpty(res))
+ {
+ string sql1 = @" select top 1 productInfo
+ from tb_InspectResult
+ where barcode = '" + barcode + @"'
+ order by createtime desc ";
+ object bb = SqlHelper.ExecuteScalar(SqlHelper.SqlConnString, CommandType.Text, sql1, null);
+ if (bb != null)
+ {
+ string color = "";
+ string colorInfo = bb.ToString();
+ string[] colors = colorInfo.Split('，');
+ if (colors.Length >= 2)
+ {
+ color = colors[2];
+
+ string sql2 = @" select partNo from tb_Product where stockNo = '" + barcode.Substring(0, 10) + @"' ";
+ object cc = SqlHelper.ExecuteScalar(SqlHelper.SqlConnString, CommandType.Text, sql2, null);
+ if (cc != null)
+ {
+ res = cc.ToString();
+ //string partNo = cc.ToString();
+ //string paintCode = partNo.Replace("-P", "") + "-" + color;
+ //string sql3 = @" select ProductID
+ // from tb_Product
+ // where partNo = '" + paintCode + @"' ";
+ //object dd = SqlHelper.ExecuteScalar(SqlHelper.SqlConnString, CommandType.Text, sql3, null);
+ //if (dd != null)
+ //{
+ // res = dd.ToString();
+ //}
+ }
+ }
+ }
+ else
+ {
+
+ string partNo = "", stockNo = "";
+
+ if (barcode.Contains('/'))
+ {
+ string[] aastr = barcode.Split('/');
+ partNo = aastr[0];
+ }
+ else if (barcode.Contains('.'))
+ {
+ string[] aastr = barcode.Split('.');
+ partNo = aastr[0];
+ }
+ else if (barcode.Length == 20)
+ {
+ stockNo = barcode.Substring(0, 10);
+ }
+ else
+ {
+ partNo = barcode;
+ }
+
+ if (!string.IsNullOrEmpty(stockNo))
+ {
+ string sql3 = @"select partNo
+ from tb_Product
+ where StockNo = '" + stockNo + @"'";
+ object dd = SqlHelper.ExecuteScalar(SqlHelper.SqlConnString, CommandType.Text, sql3, null);
+ if (dd != null)
+ {
+ res = dd.ToString();
+ }
+ }
+
+ //string sql3 = "";
+ //if (partNo != "")
+ //{
+ // sql3 = @"select ProductID
+ // from tb_Product
+ // where partNo = '" + partNo + @"'";
+ //}
+ //else
+ //{
+ // sql3 = @"select ProductID
+ // from tb_Product
+ // where StockNo = '" + stockNo + @"'";
+ //}
+
+ //object dd = SqlHelper.ExecuteScalar(SqlHelper.SqlConnString, CommandType.Text, sql3, null);
+ //if (dd != null)
+ //{
+ // res = dd.ToString();
+ //}
+ }
+ }
+ //LogHelper.WriteSysLogBase("[一码到底]传出ProductID2：" + res, MethodBase.GetCurrentMethod().Name);
+ return res;
+ }
+ catch (Exception ex)
+ {
+ //LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name);
+ return res;
+ }
+ }
public static string GetProductID(string barcode)
{
string res = "";
@@ -584,49 +819,202 @@ namespace PunchingMistake
return res;
}
- }
- public static class ScanAll
- {
- public static bool ScanResult;
- public static string barCode1;
- public static string barCode2;
- public static string barCode3;
- public static string barCode4;
- public static string barCode5;
- public static string barCode6;
- public static string partNo1;
- public static string partNo2;
- public static string partNo3;
- public static string partNo4;
- public static string partNo5;
- public static string partNo6;
- }
+ public static string SaveLineInfo(string sjBarCode, string planID,string stationNo,string partNo1,string partNo2, int LeftRivet1All, int RightRivet1All, int LeftScrew1All, int RightScrew1All, int IrIsAll )
+ {
+ string res = string.Empty;
+ try
+ {
+ string sql = $"insert into tb_Punch_Line (SjBarCode,PlanID,StationNo,PartNo1,PartNo2,barCode1,barCode2,barCode3,barCode4,barCode5,barCode6, LeftRivet1All,RightRivet1All,LeftScrew1All,RightScrew1All,IrIsAll ) " +
+ $"values('{sjBarCode}','{planID}','{stationNo}','{partNo1}','{partNo2}','{ScanAll.barCode1}','{ScanAll.barCode2}','{ScanAll.barCode3}','{ScanAll.barCode4}','{ScanAll.barCode5}','{ScanAll.barCode6}','{LeftRivet1All}','{RightRivet1All}','{LeftScrew1All}','{RightScrew1All}','{IrIsAll}' );select @@Identity";
+ object dd = SqlHelper.ExecuteScalar(SqlHelper.SqlConnString, CommandType.Text, sql, null);
+ if (dd != null)
+ {
+ res = dd.ToString();
+ }
+ }
+ catch (Exception ex)
+ {
+ //LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name);
+ LogHelper.WriteLog("保存tb_Punch_Line表数据时发生异常,异常原因:" + ex.ToString());
+
+ }
+ return res;
- public class OtherPart
- {
- public string productID3 { get; set; }
+ }
- public string qty3 { get; set; }
+ public static int UpdateLineCount(string field, string id)
+ {
+ int res = -1;
+ try
+ {
+ string sql = $"update tb_Punch_Line set {field} where id={id} ";
+ res = SqlHelper.ExecuteNonQuery(SqlHelper.SqlConnString, CommandType.Text, sql, null);
- public string productID4 { get; set; }
+ }
+ catch (Exception ex)
+ {
+ //LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name);
+ LogHelper.WriteLog(ex.ToString());
+ }
+ return res;
+ }
+ public static DataTable GetPunchLineInfo( string id)
+ {
+ DataTable res = null;
+ try
+ {
+ string sql = @"select * from tb_Punch_Line where ID ='" + id + @"'";
+ res = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null);
+
+ }
+ catch (Exception ex)
+ {
+ //LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name);
+ LogHelper.WriteLog($"查询tb_Punch_Line表错误,ID={id},异常信息:"+ex.Message);
+ }
+
+ return res;
+ }
+ public static DataTable GetPunchLineInfo(string planID,string stationNo)
+ {
+ DataTable res = null;
+ try
+ {
+ string sql = @"select * from tb_Punch_Line where PlanID ='" + planID + @"' and StationNo='"+ stationNo + "'";
+ res = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null);
- public string qty4 { get; set; }
+ }
+ catch (Exception ex)
+ {
+ //LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name);
+ LogHelper.WriteLog($"根据计划ID,工位号查询tb_Punch_Line表错误,planID={planID},stationNo={stationNo},异常信息:" + ex.Message);
+ }
- public string productID5 { get; set; }
+ return res;
+ }
+ public static int UpdatePlanState(string state, string id)
+ {
+ int res = -1;
+ try
+ {
+ string sql = $"update tb_ZP_MK_Plan set State='{state}' where id={id} ";
+ res = SqlHelper.ExecuteNonQuery(SqlHelper.SqlConnString, CommandType.Text, sql, null);
- public string qty5 { get; set; }
+ }
+ catch (Exception ex)
+ {
+ //LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name);
+ LogHelper.WriteLog(ex.ToString());
+ }
+ return res;
+ }
- public string productID6 { get; set; }
+ public static DataTable GetPunchRecord(string planID,string barcode,string date1,string date2)
+ {
+ DataTable res = null;
+ try
+ {
+ string where = "(1 = 1)";
+ if (!string.IsNullOrEmpty(barcode))
+ {
+ where = $" barcode='{barcode}' ";
+ }
+ string sql = $"select * from tb_Punch_Code_Record where PlanID ='{planID}' and {where} and CreateTime>'{date1}' and CreateTime<'{date2}'";
+ res = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null);
- public string qty6 { get; set; }
+ }
+ catch (Exception ex)
+ {
+ //LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name);
+ LogHelper.WriteLog($"查询tb_Punch_Code_Record表错误,planID={planID},异常信息:" + ex.Message);
+ }
- public string productID7 { get; set; }
+ return res;
+ }
- public string qty7 { get; set; }
+ ///
+ /// 是否需要前置工序验证
+ ///
+ ///
+ public static bool GetVerifyPreProcess()
+ {
+ DataTable res = null;
+ try
+ {
+ string sql = $"select * from tb_Config where name ='PunchAssembleVerifyQA' ";
+ res = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null);
+ if (res.Rows.Count == 0)
+ {
+ return true;
+ }
+ else
+ {
+ if (res.Rows[0]["value"].ToString()?.ToLower() == "false")
+ return false;
+ }
+
+ }
+ catch (Exception ex)
+ {
+ //LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name);
+ LogHelper.WriteLog($"查询tb_Config表错误 ,异常信息:" + ex.Message);
+ }
- public string productID8 { get; set; }
+ return true;
+ }
- public string qty8 { get; set; }
+ ///
+ /// 查询前置工序,上线前质检是否存在
+ ///
+ ///
+ public static bool GetInspectResultCheck(string sjBarCode)
+ {
+ DataTable res = null;
+ try
+ {
+ string sql = $"select * from tb_InspectResult_Check where barcode ='{sjBarCode}' and inspectResult='合格' ";
+ res = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null);
+ if (res.Rows.Count > 0)
+ {
+ return true;
+ }
+ }
+ catch (Exception ex)
+ {
+ //LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name);
+ LogHelper.WriteLog($"查询tb_InspectResult_Check表错误，barcode ='{sjBarCode}' ,异常信息:" + ex.Message);
+ }
+ return false;
+ }
+ public static string InsertInspect3(InspectModel model1)
+ {
+ return "";
+ }
+ public static DataTable SearchDefectInfo(string stationNo)
+ {
+ return null;
+ }
+ public static DataTable SearchInfoByBarCode(string barcode)
+ {
+ return null;
+ }
+ public static string GetImgPath()
+ {
+ return "";
+ }
+ public static DataTable GetLastResult(string barcode)
+ {
+ return null;
+ }
+ public static bool GetPointRepairFrWms(string barcode ,ref string errorMsg)
+ {
+ return true;
+ }
}
+
+
+
+
+
}
diff --git a/PunchingMistake/Function3.cs b/PunchingMistake/Function3.cs
new file mode 100644
index 0000000..4d95beb
--- /dev/null
+++ b/PunchingMistake/Function3.cs
@@ -0,0 +1,125 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PunchingMistake
+{
+ public class Function3
+ {
+ ///
+ /// 获取班次，规定早8至晚8为A班
+ ///
+ ///
+ public static string GetWorkClass()
+ {
+ bool classA = IsBetweenTime(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), DateTime.Now.ToString("yyyy-MM-dd") + " 08:00:00", DateTime.Now.ToString("yyyy-MM-dd") + " 20:00:00");
+ if (classA)
+ {
+ return "A班";
+ }
+ else
+ {
+ return "B班";
+ }
+ } ///
+ /// 判断传入时间是否在工作时间段内
+ ///
+ ///
+ ///
+ ///
+ ///
+ public static bool IsBetweenTime(string timeStr, string startTime, string endTime)
+ {
+ //判断传入时间是否在工作时间段内
+ try
+ {
+ TimeSpan startSpan = DateTime.Parse(startTime).TimeOfDay;
+ TimeSpan endSpan = DateTime.Parse(endTime).TimeOfDay;
+
+ DateTime t1 = Convert.ToDateTime(timeStr);
+ TimeSpan dspNow = t1.TimeOfDay;
+ if (dspNow > startSpan && dspNow < endSpan)
+ {
+ return true;
+ }
+ return false;
+ }
+ catch (Exception ex)
+ {
+ LogHelper.WriteLog(ex.ToString());
+ return false;
+ }
+ }
+
+ ///
+ /// 判断条码有效性
+ ///
+ ///
+ ///
+ public static bool BarCodeValid(string barcode)
+ {
+ bool res = false;
+ if (!string.IsNullOrWhiteSpace(barcode))
+ {
+ if (barcode.Contains("."))
+ {
+ res = true;
+ }
+ else
+ {
+ if (barcode.Length == 20)
+ {
+ res = true;
+ }
+ }
+ }
+ return res;
+ }
+ }
+ public static class ScanAll
+ {
+ public static bool ScanResult;
+ public static string barCode1;
+ public static string barCode2;
+ public static string barCode3;
+ public static string barCode4;
+ public static string barCode5;
+ public static string barCode6;
+ public static string partNo1;
+ public static string partNo2;
+ public static string partNo3;
+ public static string partNo4;
+ public static string partNo5;
+ public static string partNo6;
+ }
+
+ public class OtherPart
+ {
+ public string productID3 { get; set; }
+
+ public string qty3 { get; set; }
+
+ public string productID4 { get; set; }
+
+ public string qty4 { get; set; }
+
+ public string productID5 { get; set; }
+
+ public string qty5 { get; set; }
+
+ public string productID6 { get; set; }
+
+ public string qty6 { get; set; }
+
+ public string productID7 { get; set; }
+
+ public string qty7 { get; set; }
+
+ public string productID8 { get; set; }
+
+ public string qty8 { get; set; }
+
+ }
+}
diff --git a/PunchingMistake/Images/正确.wav b/PunchingMistake/Images/正确.wav
new file mode 100644
index 0000000..1367a16
Binary files /dev/null and b/PunchingMistake/Images/正确.wav differ
diff --git a/PunchingMistake/Images/错误.wav b/PunchingMistake/Images/错误.wav
new file mode 100644
index 0000000..e304b51
Binary files /dev/null and b/PunchingMistake/Images/错误.wav differ
diff --git a/PunchingMistake/PlcInvoke.cs b/PunchingMistake/PlcInvoke.cs
new file mode 100644
index 0000000..f13e393
--- /dev/null
+++ b/PunchingMistake/PlcInvoke.cs
@@ -0,0 +1,344 @@
+using OPCAutomation;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading;
+
+namespace PunchingMistake
+{
+ public class PlcInvoke
+ {
+ private OPCServer opcServer;
+ private OPCGroups opcGroups;
+ private OPCGroup opcGroup1;
+ private OPCItems opcItems;
+ private static OPCItem[] opcItemm1;
+ public static bool _linkDev = true;
+
+ public Action ShowLinkInfo = null;
+ //public Action ShowScanInfo = null;
+ public Action ShowMessage = null;
+ public event Action DevAfterReturnResult = null;
+
+ //private Entity_t_PreAssembleLine t_PreAssembleLine = new Entity_t_PreAssembleLine();
+
+ ///
+ /// 接收到的值
+ ///
+ public Dictionary _OpcAddressDict = new Dictionary();
+
+ public DataTable _OpcAddressTable = new DataTable();
+ private string _channelDev = string.Empty;
+ public bool AllowReceive = false;
+ public string _stationNo;
+ private string _lineRowID = "";
+ public PlcInvoke(string channelDev, string stationNo)
+ {
+ _channelDev = channelDev;
+ _stationNo = stationNo;
+ }
+ public void SetLineID(string lineID)
+ {
+ _lineRowID = lineID;
+ }
+ public bool InitDev(int rate)
+ {
+
+ if (_linkDev == false)
+ {
+ return false;
+ }
+ try
+ {
+ // int rate = 500;
+ CreateServer();
+ if (ConnectServer())
+ {
+ opcGroups = opcServer.OPCGroups;
+ opcGroup1 = opcGroups.Add("GRP");
+ SetGroupProperty(opcGroup1, rate);
+ opcItems = opcGroup1.OPCItems;
+
+ opcItems.DefaultIsActive = true;
+ LoadOpcItem(_stationNo);
+ opcGroup1.DataChange += OpcGroup1_DataChange;
+ ShowLinkInfo(true, true);
+ }
+ return true;
+ }
+ catch (Exception ex)
+ {
+ ShowLinkInfo(false, true);
+ //MyLogger.Write("设备初始化发生错误,错误原因:" + ex.Message);
+ LogHelper.WriteLog("设备初始化发生错误,错误原因:" + ex.Message);
+ //throw new Exception("设备初始化发生错误,错误原因:" + ex.Message);
+ return false;
+ }
+
+ }
+
+ ///
+ ///
+ ///
+ /// PLC地址点位
+ /// 操作类型 冲孔,流钻,EOL,返修
+ public void SendToPLC( bool isInit,string lineRowID)
+ {
+ if(isInit == false)
+ {
+ _lineRowID = lineRowID;
+ foreach (OPCItem item in opcItemm1)
+ {
+ if (item.ItemID.Contains("Start"))
+ {
+ item.Write(2);
+ ShowMessage("发送启动信号:" + 2, true);
+ }
+ //if (item.ItemID.Contains("caseNo"))
+ //{
+ // item.Write(caseNo);
+ // ShowMessage("发送料盒号:" + caseNo, true);
+ //}
+
+ }
+ ShowMessage("发送启动信号成功", true);
+ }
+ else
+ {
+ foreach (OPCItem item in opcItemm1)
+ {
+ if (item.ItemID.Contains("Start"))
+ {
+ item.Write(1);
+ }
+ if (item.ItemID.Contains("ScrewL"))
+ {
+ item.Write(0);
+ }
+ if (item.ItemID.Contains("ScrewR"))
+ {
+ item.Write(0);
+ }
+ if (item.ItemID.Contains("RivetL"))
+ {
+ item.Write(0);
+ }
+ if (item.ItemID.Contains("RivetR"))
+ {
+ item.Write(0);
+ }
+ if (item.ItemID.Contains("IrIs"))
+ {
+ item.Write(0);
+ }
+ //if (item.ItemID.Contains("NutL"))
+ //{
+ // item.Write(0);
+ //}
+ //if (item.ItemID.Contains("NutR"))
+ //{
+ // item.Write(0);
+ //}
+ //螺钉类型 不用初始化
+ }
+ ShowMessage("发送初始化设备信号成功", true);
+ }
+
+ AllowReceive = true;
+ }
+ public void WriteToPLCTest()
+ {
+ foreach (OPCItem item in opcItemm1)
+ {
+
+ if (item.ItemID.Contains("ScrewL"))
+ {
+ item.Write(8);
+ }
+ if (item.ItemID.Contains("ScrewR"))
+ {
+ item.Write(8);
+ }
+ if (item.ItemID.Contains("RivetL"))
+ {
+ item.Write(8);
+ }
+ if (item.ItemID.Contains("RivetR"))
+ {
+ item.Write(8);
+ }
+ if (item.ItemID.Contains("IrIs"))
+ {
+ item.Write(8);
+ }
+ //if (item.ItemID.Contains("NutL"))
+ //{
+ // item.Write(8);
+ //}
+ //if (item.ItemID.Contains("NutR"))
+ //{
+ // item.Write(8);
+ //}
+ //螺钉类型 不用初始化
+ }
+ }
+ void LoadOpcItem(string stationNo)
+ {
+ Dictionary dict = GetPlcAddress();// GetDevInfo();
+
+ opcItemm1 = new OPCItem[dict.Count];
+ int i = 0;
+ foreach (var dictItem in dict)
+ {
+ opcItemm1[i] = opcItems.AddItem(dictItem.Value, dictItem.Key);
+
+ i++;
+ }
+
+ }
+ public Dictionary GetPlcAddress()
+ {
+ Dictionary dict = new Dictionary();
+ dict.Add(0, _channelDev + ".LinkRate");
+ dict.Add(1, _channelDev + ".Start");
+ dict.Add(2, _channelDev + ".ScrewL");
+ dict.Add(3, _channelDev + ".ScrewR");
+ dict.Add(4, _channelDev + ".RivetL");
+ dict.Add(5, _channelDev + ".RivetR");
+ dict.Add(6, _channelDev + ".IrIs");
+ //dict.Add(7, _channelDev + ".caseNo");
+ //dict.Add(8, _channelDev + ".NutL");
+ //dict.Add(9, _channelDev + ".NutR");
+ return dict;
+ }
+
+
+ private string GetOpcName(DataRow row)
+ {
+ return $"{row["ChannelName"].ToString()}.{row["DevName"].ToString()}.{row["LableName"].ToString()}";
+ }
+
+
+ private void OpcGroup1_DataChange(int TransactionID, int NumItems, ref Array ClientHandles, ref Array ItemValues, ref Array Qualities, ref Array TimeStamps)
+ {
+ try
+ {
+ if (_linkDev == false) return;
+
+
+ for (int i = 1; i <= NumItems; i++)
+ {
+ int handle = Convert.ToInt32(ClientHandles.GetValue(i).ToString().Trim());
+ string itemValue = ItemValues.GetValue(i).ToString();
+ string address = opcItemm1[(handle)].ItemID;
+ if (!string.IsNullOrEmpty(_lineRowID))
+ {
+ if (address.Contains("ScrewL"))
+ {
+ Function2.UpdateLineCount("LeftScrew1=" + itemValue, _lineRowID);
+ }
+ else if (address.Contains("ScrewR"))
+ {
+ Function2.UpdateLineCount("RightScrew1=" + itemValue, _lineRowID);
+ }
+ else if (address.Contains("RivetL"))
+ {
+ Function2.UpdateLineCount("LeftRivet1=" + itemValue, _lineRowID);
+ }
+ else if (address.Contains("RivetR"))
+ {
+ Function2.UpdateLineCount("RightRivet1=" + itemValue, _lineRowID);
+ }
+ else if (address.Contains("IrIs"))
+ {
+ Function2.UpdateLineCount("IrIs=" + itemValue, _lineRowID);
+ }
+ //else if (address.Contains("NutL"))
+ //{
+ // Function2.UpdateLineCount("LeftNut=" + itemValue, _lineRowID);
+ //}
+ //else if (address.Contains("NutR"))
+ //{
+ // Function2.UpdateLineCount("RightNut=" + itemValue, _lineRowID);
+ //}
+ }
+
+ }
+ }
+ catch (Exception ex)
+ {
+ //MyLogger.Write("设备返回数据发生异常,错误原因:" + ex.Message);
+ LogHelper.WriteLog("设备返回数据发生异常,错误原因:" + ex.Message);
+ ShowMessage("设备返回数据发生异常,错误原因:" + ex.Message, false);
+ }
+
+ }
+
+
+
+ ///
+ /// 创建服务
+ ///
+ ///
+ private void CreateServer()
+ {
+ try
+ {
+ opcServer = new OPCServer();
+ }
+ catch (Exception ex)
+ {
+ throw new Exception("创建OpcServer时发生异常,异常信息:" + ex.Message);
+ }
+ }
+ ///
+ /// 连接到服务器
+ ///
+ ///
+ ///
+ ///
+ private bool ConnectServer()
+ {
+ try
+ {
+ opcServer.Connect("Kepware.KEPServerEX.V6", "");
+ ShowLinkResult(true, true);
+ }
+ catch (Exception ex)
+ {
+ ShowLinkResult(false, true);
+
+ //ShowScanResult(false);
+
+ LogHelper.WriteLog($"设备连接异常,异常原因:" + ex.Message);
+ throw new Exception($"设备连接异常");
+ }
+ return true;
+ }
+ ///
+ /// 设置组的属性
+ ///
+ ///
+ ///
+ private void SetGroupProperty(OPCGroup opcGroup, int updateRate)
+ {
+ opcGroup.IsActive = true;
+ opcGroup.DeadBand = 0;
+ opcGroup.UpdateRate = updateRate;
+ opcGroup.IsSubscribed = true;
+ }
+
+
+ private void ShowLinkResult(bool isSuccess, bool isWriteLog)
+ {
+ if (ShowLinkInfo != null)
+ {
+ ShowLinkInfo(isSuccess, isWriteLog);
+ }
+ }
+
+ }
+
+}
diff --git a/PunchingMistake/Printer.cs b/PunchingMistake/Printer.cs
new file mode 100644
index 0000000..e65c33f
--- /dev/null
+++ b/PunchingMistake/Printer.cs
@@ -0,0 +1,55 @@
+using grproLib;
+using InjectionPC;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PunchingMistake
+{
+ public class Printer
+ {
+ ///
+ /// 小件总成装配打印总成条码
+ ///
+ public static void PrintPunchAssembleBarCode( string barCode, string partNo1, string partName, string serialNo)
+ {
+ string filename = GetPrintFileName();
+ DataTable headTable = new DataTable();
+ headTable.Columns.Add("BarCode");
+ headTable.Columns.Add("PartName");
+ headTable.Columns.Add("PartNo");
+ headTable.Columns.Add("BatchNo");
+ headTable.Columns.Add("SerialNo");
+ headTable.Columns.Add("Line");
+ DataRow row = headTable.NewRow();
+
+ row["BarCode"] = barCode;
+ row["PartNo"] = partNo1;
+ row["PartName"] = partName;
+ row["BatchNo"] = DateTime.Now.ToString("yyMMdd");
+ row["SerialNo"] = serialNo;
+ row["Line"] = ConfigurationManager.AppSettings["Line"];
+ string printBoxName = "Printer1";
+
+ string reportName = ConfigurationManager.AppSettings[printBoxName].ToString();
+ headTable.Rows.Add(row);
+
+ ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoLandscape, 1, reportName);
+
+ rp.Report.Print(false);
+ }
+ static string GetPrintFileName()
+ {
+ if (Program.station == "F01")
+ {
+ return System.AppDomain.CurrentDomain.BaseDirectory + "Report\\总成条码MI.grf";
+ }
+
+ return System.AppDomain.CurrentDomain.BaseDirectory + "Report\\总成条码MI.grf";
+ }
+ }
+}
diff --git a/PunchingMistake/PunchingMistake.csproj b/PunchingMistake/PunchingMistake.csproj
index 618b3e4..12b807b 100644
--- a/PunchingMistake/PunchingMistake.csproj
+++ b/PunchingMistake/PunchingMistake.csproj
@@ -49,6 +49,13 @@
..\..\BjbmptMesNgccNew\Stone.Common.Dlls\Interop.grproLib.dll
True
+
+ DLL\Interop.OPCAutomation.dll
+ True
+
+
+ DLL\PlaySound.dll
+
@@ -87,17 +94,23 @@
FrmLogin.cs
+
+ Form
+
+
+ FrmPlanSeach.cs
+
Form
FrmProScreen3.cs
-
+
Form
-
- FrmQualityNew.cs
+
+ FrmQualityNew1.cs
Form
@@ -105,6 +118,12 @@
FrmQuality.cs
+
+ Form
+
+
+ FrmQualityNew.cs
+
Form
@@ -112,7 +131,10 @@
FrmScan.cs
+
+
+
@@ -124,15 +146,21 @@
FrmLogin.cs
+
+ FrmPlanSeach.cs
+
FrmProScreen3.cs
-
- FrmQualityNew.cs
+
+ FrmQualityNew1.cs
FrmQuality.cs
+
+ FrmQualityNew.cs
+
FrmScan.cs
@@ -154,7 +182,9 @@
Settings.settings
True
-
+
+ PreserveNewest
+
@@ -181,7 +211,18 @@
-
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+