ruoxing.wang
/
BBMPT1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

喷涂质检状态增加一些前端校验

master
ruoxing.wang 4 days ago
parent
dff4969456
commit
d483eb6d58
10 changed files with 1018 additions and 786 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 166
      FacOneZPStation/FrmZP.Designer.cs
  2. 428
      InjectionPC/FrmMain.Designer.cs
  3. 546
      InjectionPC/FrmMain2408.Designer.cs
  4. 28
      InjectionPC/FrmMain2408.cs
  5. 405
      InjectionPC/FrmMain2411.Designer.cs
  6. 23
      InjectionPC/FrmMain2411.cs
  7. 144
      MESClassLibrary/BussinessHelper.cs
  8. 37
      PaintingPC/FrmQuality.cs
  9. 6
      PaintingPC/PaintingPC.csproj
  10. 21
      WebService/Function.cs

166
FacOneZPStation/FrmZP.Designer.cs
View File

@ -77,7 +77,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, 777F));
this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 717F));
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 +86,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(7, 1400);
this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.tableLayoutPanel3.Location = new System.Drawing.Point(6, 1224);
this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
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, 40F));
this.tableLayoutPanel3.Size = new System.Drawing.Size(2546, 423);
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.TabIndex = 3;
//
// button6
@ -102,10 +102,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(1781, 14);
this.button6.Margin = new System.Windows.Forms.Padding(14);
this.button6.Location = new System.Drawing.Point(1630, 12);
this.button6.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
this.button6.Name = "button6";
this.button6.Size = new System.Drawing.Size(751, 183);
this.button6.Size = new System.Drawing.Size(692, 161);
this.button6.TabIndex = 7;
this.button6.Text = "手动打印箱单";
this.button6.UseVisualStyleBackColor = false;
@ -116,10 +116,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(7, 217);
this.button1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.button1.Location = new System.Drawing.Point(6, 190);
this.button1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(578, 200);
this.button1.Size = new System.Drawing.Size(530, 176);
this.button1.TabIndex = 6;
this.button1.Text = "打印标签";
this.button1.UseVisualStyleBackColor = false;
@ -131,10 +131,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(1200, 225);
this.button5.Margin = new System.Windows.Forms.Padding(14);
this.button5.Location = new System.Drawing.Point(1099, 197);
this.button5.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
this.button5.Name = "button5";
this.button5.Size = new System.Drawing.Size(553, 184);
this.button5.Size = new System.Drawing.Size(505, 162);
this.button5.TabIndex = 5;
this.button5.Text = "不合格";
this.button5.UseVisualStyleBackColor = false;
@ -145,10 +145,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(599, 6);
this.button4.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.button4.Location = new System.Drawing.Point(548, 5);
this.button4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.button4.Name = "button4";
this.button4.Size = new System.Drawing.Size(580, 199);
this.button4.Size = new System.Drawing.Size(532, 175);
this.button4.TabIndex = 4;
this.button4.Text = "下一计划";
this.button4.UseVisualStyleBackColor = false;
@ -159,10 +159,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(7, 6);
this.button3.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.button3.Location = new System.Drawing.Point(6, 5);
this.button3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.button3.Name = "button3";
this.button3.Size = new System.Drawing.Size(578, 199);
this.button3.Size = new System.Drawing.Size(530, 175);
this.button3.TabIndex = 3;
this.button3.Text = "上一计划";
this.button3.UseVisualStyleBackColor = false;
@ -174,10 +174,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(606, 225);
this.button2.Margin = new System.Windows.Forms.Padding(14);
this.button2.Location = new System.Drawing.Point(555, 197);
this.button2.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(566, 184);
this.button2.Size = new System.Drawing.Size(518, 162);
this.button2.TabIndex = 2;
this.button2.Text = "补打标签";
this.button2.UseVisualStyleBackColor = false;
@ -188,10 +188,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(1774, 217);
this.button7.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.button7.Location = new System.Drawing.Point(1623, 190);
this.button7.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.button7.Name = "button7";
this.button7.Size = new System.Drawing.Size(765, 200);
this.button7.Size = new System.Drawing.Size(706, 176);
this.button7.TabIndex = 8;
this.button7.Text = "补打箱单";
this.button7.UseVisualStyleBackColor = false;
@ -203,11 +203,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(1426, 3);
this.label7.Location = new System.Drawing.Point(1301, 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(272, 241);
this.label7.Size = new System.Drawing.Size(249, 210);
this.label7.TabIndex = 32;
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
@ -215,10 +215,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(411, 127);
this.textBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.textBox2.Location = new System.Drawing.Point(375, 111);
this.textBox2.Margin = new System.Windows.Forms.Padding(4);
this.textBox2.Name = "textBox2";
this.textBox2.Size = new System.Drawing.Size(1008, 87);
this.textBox2.Size = new System.Drawing.Size(919, 77);
this.textBox2.TabIndex = 30;
this.textBox2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox2_KeyDown);
//
@ -227,10 +227,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, 122);
this.label3.Location = new System.Drawing.Point(5, 107);
this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(397, 124);
this.label3.Size = new System.Drawing.Size(361, 108);
this.label3.TabIndex = 29;
this.label3.Text = "扫描物料条码";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -240,10 +240,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(1703, 249);
this.labOrderNo.Location = new System.Drawing.Point(1555, 218);
this.labOrderNo.Margin = new System.Windows.Forms.Padding(2);
this.labOrderNo.Name = "labOrderNo";
this.labOrderNo.Size = new System.Drawing.Size(846, 174);
this.labOrderNo.Size = new System.Drawing.Size(781, 151);
this.labOrderNo.TabIndex = 28;
this.labOrderNo.Text = "A64654646464";
this.labOrderNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -254,10 +254,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(1426, 249);
this.label4.Location = new System.Drawing.Point(1301, 218);
this.label4.Margin = new System.Windows.Forms.Padding(2);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(272, 174);
this.label4.Size = new System.Drawing.Size(249, 151);
this.label4.TabIndex = 27;
this.label4.Text = "计划编号";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -268,10 +268,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(409, 249);
this.labStationNo.Location = new System.Drawing.Point(373, 218);
this.labStationNo.Margin = new System.Windows.Forms.Padding(2);
this.labStationNo.Name = "labStationNo";
this.labStationNo.Size = new System.Drawing.Size(1012, 174);
this.labStationNo.Size = new System.Drawing.Size(923, 151);
this.labStationNo.TabIndex = 26;
this.labStationNo.Text = "V253-MF-S后保下部延伸焊接";
this.labStationNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -282,10 +282,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, 249);
this.label2.Location = new System.Drawing.Point(3, 218);
this.label2.Margin = new System.Windows.Forms.Padding(2);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(401, 174);
this.label2.Size = new System.Drawing.Size(365, 151);
this.label2.TabIndex = 25;
this.label2.Text = "工位名称";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -295,10 +295,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(1703, 428);
this.labPName.Location = new System.Drawing.Point(1555, 374);
this.labPName.Margin = new System.Windows.Forms.Padding(2);
this.labPName.Name = "labPName";
this.labPName.Size = new System.Drawing.Size(846, 284);
this.labPName.Size = new System.Drawing.Size(781, 248);
this.labPName.TabIndex = 24;
this.labPName.Text = "MF253 MF S后保";
this.labPName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -309,10 +309,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(1426, 428);
this.label8.Location = new System.Drawing.Point(1301, 374);
this.label8.Margin = new System.Windows.Forms.Padding(2);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(272, 284);
this.label8.Size = new System.Drawing.Size(249, 248);
this.label8.TabIndex = 23;
this.label8.Text = "产品名称";
this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -323,10 +323,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(409, 428);
this.labPartNo.Location = new System.Drawing.Point(373, 374);
this.labPartNo.Margin = new System.Windows.Forms.Padding(2);
this.labPartNo.Name = "labPartNo";
this.labPartNo.Size = new System.Drawing.Size(1012, 284);
this.labPartNo.Size = new System.Drawing.Size(923, 248);
this.labPartNo.TabIndex = 22;
this.labPartNo.Text = "A2530822665";
this.labPartNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -342,10 +342,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, 428);
this.label6.Location = new System.Drawing.Point(3, 374);
this.label6.Margin = new System.Windows.Forms.Padding(2);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(401, 284);
this.label6.Size = new System.Drawing.Size(365, 248);
this.label6.TabIndex = 21;
this.label6.Text = "产品代码";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -356,10 +356,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(1703, 717);
this.labBadCount.Location = new System.Drawing.Point(1555, 627);
this.labBadCount.Margin = new System.Windows.Forms.Padding(2);
this.labBadCount.Name = "labBadCount";
this.labBadCount.Size = new System.Drawing.Size(846, 515);
this.labBadCount.Size = new System.Drawing.Size(781, 451);
this.labBadCount.TabIndex = 20;
this.labBadCount.Text = "0";
this.labBadCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -370,10 +370,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(409, 717);
this.labNum.Location = new System.Drawing.Point(373, 627);
this.labNum.Margin = new System.Windows.Forms.Padding(2);
this.labNum.Name = "labNum";
this.labNum.Size = new System.Drawing.Size(1012, 515);
this.labNum.Size = new System.Drawing.Size(923, 451);
this.labNum.TabIndex = 18;
this.labNum.Text = "152/210";
this.labNum.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -384,10 +384,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, 717);
this.label10.Location = new System.Drawing.Point(3, 627);
this.label10.Margin = new System.Windows.Forms.Padding(2);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(401, 515);
this.label10.Size = new System.Drawing.Size(365, 451);
this.label10.TabIndex = 17;
this.label10.Text = "计划/完成数";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -400,7 +400,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(397, 120);
this.label14.Size = new System.Drawing.Size(361, 105);
this.label14.TabIndex = 12;
this.label14.Text = "扫描本体条码";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -409,10 +409,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(411, 6);
this.textBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.textBox1.Location = new System.Drawing.Point(375, 5);
this.textBox1.Margin = new System.Windows.Forms.Padding(4);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(1008, 87);
this.textBox1.Size = new System.Drawing.Size(919, 77);
this.textBox1.TabIndex = 13;
this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown);
//
@ -421,11 +421,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(1705, 1);
this.labErrMessage.Location = new System.Drawing.Point(1557, 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(842, 245);
this.labErrMessage.Size = new System.Drawing.Size(777, 214);
this.labErrMessage.TabIndex = 16;
this.labErrMessage.Text = "条码与产品不匹配，重新扫描";
this.labErrMessage.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -437,9 +437,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, 276F));
this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 849F));
this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 40F));
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, 784F));
this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 37F));
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 +459,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, 154);
this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 134);
this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4);
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, 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.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.TabIndex = 2;
//
// label12
@ -478,10 +478,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(1426, 717);
this.label12.Location = new System.Drawing.Point(1301, 627);
this.label12.Margin = new System.Windows.Forms.Padding(2);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(272, 515);
this.label12.Size = new System.Drawing.Size(249, 451);
this.label12.TabIndex = 19;
this.label12.Text = "不合格数";
this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -491,10 +491,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(1919, 0);
this.labTime.Location = new System.Drawing.Point(1756, 0);
this.labTime.Margin = new System.Windows.Forms.Padding(0);
this.labTime.Name = "labTime";
this.labTime.Size = new System.Drawing.Size(641, 149);
this.labTime.Size = new System.Drawing.Size(591, 130);
this.labTime.TabIndex = 7;
this.labTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.labTime.Click += new System.EventHandler(this.labTime_Click);
@ -508,7 +508,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(347, 149);
this.pictureBox1.Size = new System.Drawing.Size(318, 130);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox1.TabIndex = 0;
this.pictureBox1.TabStop = false;
@ -518,10 +518,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(347, 0);
this.label1.Location = new System.Drawing.Point(318, 0);
this.label1.Margin = new System.Windows.Forms.Padding(0);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(1572, 149);
this.label1.Size = new System.Drawing.Size(1438, 130);
this.label1.TabIndex = 1;
this.label1.Text = "装配工位信息看板";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -532,7 +532,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, 640F));
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 590F));
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 +542,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(2560, 149);
this.tableLayoutPanel2.Size = new System.Drawing.Size(2347, 130);
this.tableLayoutPanel2.TabIndex = 0;
//
// tableLayoutPanel1
@ -559,18 +559,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, 434F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(2560, 1829);
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.TabIndex = 9;
//
// FrmZP
//
this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(2560, 1829);
this.ClientSize = new System.Drawing.Size(2347, 1600);
this.Controls.Add(this.tableLayoutPanel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.Name = "FrmZP";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "FrmZP";

428
InjectionPC/FrmMain.Designer.cs
View File

File diff suppressed because it is too large

546
InjectionPC/FrmMain2408.Designer.cs
View File

File diff suppressed because it is too large

28
InjectionPC/FrmMain2408.cs
View File

@ -413,8 +413,27 @@ namespace InjectionPC
}
for (int i = 1; i <= NumItems; i++)
{
if ((ItemValues!=null && ItemValues.GetValue(i).ToString() == "True") || IsTest ==true)
{
if (ItemValues == null)
{
_bbll.SavePlcReceive(Program.station, TransactionID, NumItems, "ItemValues= null ", planID, "2408");
continue;
}
if (ItemValues.Length == 0)
{
_bbll.SavePlcReceive(Program.station, TransactionID, NumItems, "ItemValues.Length ==0 ", planID, "2408");
continue;
}
string val = ItemValues.GetValue(i)?.ToString();
if (ItemValues.GetValue(i)?.ToString() != "True")
{
_bbll.SavePlcReceive(Program.station, TransactionID, NumItems, "ItemValues.GetValue(i)= " + val, planID, "2408");
}
if ((ItemValues!=null && ItemValues.GetValue(i)?.ToString() == "True") || IsTest ==true)
{
//LogSysBLL.AddInfo("true" + label6.Text, MethodBase.GetCurrentMethod());
GetClass();
@ -424,11 +443,16 @@ namespace InjectionPC
//DateTime lastTime = GetPrintTime(label6.Text);
//long ts = TimeDiff(lastTime, DateTime.Now);
TimeSpan span=DateTime.Now - lastTime;
if (span.TotalSeconds < Convert.ToDouble(ConfigurationManager.AppSettings["InterValT"]))
{
return;
}
_bbll.SavePlcReceive(Program.station, TransactionID, NumItems, aa, planID, "2408");
#endregion

405
InjectionPC/FrmMain2411.Designer.cs
View File

File diff suppressed because it is too large

23
InjectionPC/FrmMain2411.cs
View File

@ -360,7 +360,23 @@ namespace InjectionPC
}
for (int i = 1; i <= NumItems; i++)
{
if ((ItemValues!=null && ItemValues.GetValue(i).ToString() == "True") || IsTest ==true)
if(ItemValues ==null)
{
_bbll.SavePlcReceive(Program.station, TransactionID, NumItems, "ItemValues= null ", planID, "2411");
continue;
}
if (ItemValues.Length ==0)
{
_bbll.SavePlcReceive(Program.station, TransactionID, NumItems, "ItemValues.Length ==0 ", planID, "2411");
continue;
}
string val = ItemValues.GetValue(i)?.ToString();
if (ItemValues.GetValue(i)?.ToString() != "True")
{
_bbll.SavePlcReceive(Program.station, TransactionID, NumItems, "ItemValues.GetValue(i)= " + val, planID, "2411");
}
if ((ItemValues!=null && ItemValues.GetValue(i)?.ToString() == "True") || IsTest ==true)
{
//LogSysBLL.AddInfo("true" + label6.Text, MethodBase.GetCurrentMethod());
@ -1094,6 +1110,11 @@ namespace InjectionPC
initPlan();
lastTime=DateTime.Now;
}
else
{
//MessageBox.Show("PLC设备返回信息错误,ItemValues值为空!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
continue;
}
}
}
catch (Exception ex)

144
MESClassLibrary/BussinessHelper.cs
View File

@ -47,6 +47,148 @@ namespace MESClassLibrary
}
/// <summary>
/// 喷涂质检,当前状态和上一次质检状态是否允许操作判断
/// </summary>
/// <param name="state">当前操作状态 1 合格 2报废 9返喷 ,4喷涂其他</param>
/// <param name="lastState">上次操作状态</param>
/// <param name="oneBarCode"></param>
/// <param name="errorMssg"></param>
/// <returns></returns>
//public static bool PaintStateVerify(int state, string lastState, string oneBarCode, ref string errorMssg)
//{
// //合格 1 最近一条是报废记录,可以重发. 否则不可以.
// if (state == 1)
// {
// //第一次合格
// if (string.IsNullOrEmpty(lastState))
// {
// return true;
// }
// else
// {
// //上一次是合格
// if (lastState.Contains("合格"))
// {
// errorMssg = $"条码[{oneBarCode}]已判定[合格],不需要重复判定为[合格].";
// return false;
// }
// else if (lastState.Contains("报废"))
// {
// errorMssg = $"条码[{oneBarCode}]已判定[报废],不能重新判定[合格].";
// return false;
// }
// else
// {
// return true;
// }
// }
// }
// //不合格报废0 有报工记录不能重发
// else if (state == 2)
// {
// //第一次操作
// if (string.IsNullOrEmpty(lastState))
// {
// return true;
// }
// //上次合格,这次转报废,需要wms给true
// if (lastState.Contains("合格"))
// {
// bool wmsAllow = GetWmsCompleteState(oneBarCode);
// if (wmsAllow == false)
// {
// errorMssg = $"条码[{oneBarCode}]在Wms已处理,不允许重新判定为[报废].";
// return false;
// }
// else
// {
// return true;
// }
// }
// if (lastState.Contains("报废"))
// {
// errorMssg = $"条码[{oneBarCode}]已报废,不需要重复判定为[报废].";
// return false;
// }
// return true;
// }
// //其它状态
// else if (state == 4)
// {
// //第一次合格
// if (string.IsNullOrEmpty(lastState))
// {
// return true;
// }
// //上次合格,这次转其它,需要wms给true
// if (lastState.Contains("合格"))
// {
// bool wmsAllow = GetWmsCompleteState(oneBarCode);
// if (wmsAllow == false)
// {
// errorMssg = $"条码[{oneBarCode}]在Wms已处理,不允许重新判定为[其它].";
// return false;
// }
// else
// {
// return true;
// }
// }
// else if (lastState.Contains("报废"))
// {
// errorMssg = $"条码[{oneBarCode}]已判定[报废],不能重新判定[其它].";
// return false;
// }
// if (lastState.Contains("其它"))
// {
// errorMssg = $"条码[{oneBarCode}]已判定为[其它],不需要重复判定为[其它].";
// return false;
// }
// }
// else if (state == 9)
// {
// //第一次合格
// if (string.IsNullOrEmpty(lastState))
// {
// return true;
// }
// //上次合格,这次转报废,需要wms给true
// if (lastState.Contains("合格"))
// {
// bool wmsAllow = GetWmsCompleteState(oneBarCode);
// if (wmsAllow == false)
// {
// errorMssg = $"条码[{oneBarCode}]在Wms已处理,不允许重新判定为[返喷].";
// return false;
// }
// else
// {
// return true;
// }
// }
// else if (lastState.Contains("报废"))
// {
// errorMssg = $"条码[{oneBarCode}]已判定[报废],不能重新判定[返喷].";
// return false;
// }
// if (lastState.Contains("打磨"))
// {
// errorMssg = $"条码[{oneBarCode}]已判定为[返喷],不需要重复判定为[返喷].";
// return false;
// }
// }
// return true;
//}
}
}

37
PaintingPC/FrmQuality.cs
View File

@ -276,6 +276,17 @@ namespace PaintingPC
}
}
bool SaveBeforeVerify( string currentRst)
{
string lastRst = GetLastInspectRst(txtBarCode.Text.Trim());
if (lastRst.Contains("报废"))
{
MessageBox.Show($"条码已判定为报废，不能再判定为{currentRst}.");
Clear();
return false;
}
return true;
}
/// <summary>
/// 合格
/// </summary>
@ -299,7 +310,12 @@ namespace PaintingPC
ClearControlColor(SetControlGroup());
btnAbt.BackColor = Color.Red;
//string lastRst = GetLastInspectRst(txtBarCode.Text.Trim());
bool rr = SaveBeforeVerify("合格");
if(rr == false)
{
return;
}
//if (lastRst.Contains("合格"))
//{
// MessageBox.Show("条码已判定为合格，无需重复判定");
@ -349,6 +365,12 @@ namespace PaintingPC
Clear();
return;
}
bool rr = SaveBeforeVerify("其它");
if (rr == false)
{
return;
}
SaveRst("其它", colorName, partName,4);
}
@ -403,7 +425,12 @@ namespace PaintingPC
//}
string s = _isWmsQuality == false ? "打磨" : "打磨WMS";
bool rr = SaveBeforeVerify("返喷");
if (rr == false)
{
return;
}
SaveRst(s, colorName, partName,9);
}
@ -470,6 +497,12 @@ namespace PaintingPC
ClearControlColor(SetControlGroup());
btnAbt.BackColor = Color.Red;
bool rr = SaveBeforeVerify("报废");
if (rr == false)
{
return;
}
SaveRst("报废", colorName, partName,2, userName);
}

6
PaintingPC/PaintingPC.csproj
View File

@ -313,6 +313,12 @@
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MESClassLibrary\MESClassLibrary.csproj">
<Project>{867989d8-6837-41dc-9bf1-4658f5d6cfef}</Project>
<Name>MESClassLibrary</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

21
WebService/Function.cs
View File

@ -1159,12 +1159,14 @@ namespace Webservice
//返喷状态
int rePaint = GetRepaintStateNew(inspectTable);
pRepaint = rePaint;
//bool paintStateVerify = MESClassLibrary.BussinessHelper. PaintStateVerify(state, lastState, oneBarCode, ref errorMssg);
//return paintStateVerify;
//合格 1 最近一条是报废记录,可以重发. 否则不可以.
if (state == 1)
{
//第一次合格
if (string.IsNullOrEmpty(lastState))
if (string.IsNullOrEmpty(lastState))
{
return true;
}
@ -1181,12 +1183,13 @@ namespace Webservice
errorMssg = $"条码[{oneBarCode}]已判定[报废],不能重新判定[合格].";
return false;
}
else
else
{
return true;
}
}
#region 原来的
//if (inspectTable.Rows.Count > 1) //有多条记录,判定前一条记录状态. 若只有一条记录,就是允许的
@ -1245,7 +1248,7 @@ namespace Webservice
if (lastState.Contains("合格"))
{
bool wmsAllow = GetWmsCompleteState(oneBarCode);
if(wmsAllow == false)
if (wmsAllow == false)
{
errorMssg = $"条码[{oneBarCode}]在Wms已处理,不允许重新判定为[报废].";
return false;
@ -1264,9 +1267,9 @@ namespace Webservice
return true;
}
//其它状态
else if(state == 4)
else if (state == 4)
{
//第一次合格
if (string.IsNullOrEmpty(lastState))
@ -1299,7 +1302,7 @@ namespace Webservice
}
}
else if(state == 9)
else if (state == 9)
{
//第一次合格
if (string.IsNullOrEmpty(lastState))
@ -1325,7 +1328,7 @@ namespace Webservice
errorMssg = $"条码[{oneBarCode}]已判定[报废],不能重新判定[返喷].";
return false;
}
if (lastState.Contains("打磨") )
if (lastState.Contains("打磨"))
{
errorMssg = $"条码[{oneBarCode}]已判定为[返喷],不需要重复判定为[返喷].";
return false;
@ -1334,6 +1337,8 @@ namespace Webservice
return true;
}
/// <summary>
/// 返喷状态 只存在返喷 Repaint =1 只存在其它 Repaint =3 既存在返喷又存在其它 Repaint =4
/// </summary>
@ -1575,7 +1580,7 @@ namespace Webservice
/// </summary>
/// <param name="oneBarCode"></param>
/// <returns></returns>
static DataTable GetInspectResultTable(string oneBarCode )
public static DataTable GetInspectResultTable(string oneBarCode )
{
string sql = "";
if (oneBarCode.Contains("."))

Write Preview
Loading…
Cancel
Save