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

1

master
ruoxing.wang 3 weeks ago
parent
9dad660e79
commit
ba53747309
10 changed files with 283 additions and 180 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 76
      FacOneZPStation/FrmZP.Designer.cs
  2. 82
      InjectionPC/FrmMain2408.Designer.cs
  3. 144
      InjectionPC/FrmMain2408.cs
  4. 4
      InjectionPC/FrmQuality.cs
  5. 37
      InjectionPC/Sill.grf
  6. BIN
      InjectionPC/单个条码2.grf
  7. 9
      InjectionSearch/FrmBarCodeSearch2408.cs
  8. 2
      MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs
  9. 51
      WebService/Function.cs
  10. 58
      WebService/WMSWebService.asmx.cs

76
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.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, 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.Percent, 32.86026F));
this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 702F)); this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 704F));
this.tableLayoutPanel3.Controls.Add(this.button6, 3, 0); this.tableLayoutPanel3.Controls.Add(this.button6, 3, 0);
this.tableLayoutPanel3.Controls.Add(this.button1, 0, 1); this.tableLayoutPanel3.Controls.Add(this.button1, 0, 1);
this.tableLayoutPanel3.Controls.Add(this.button5, 2, 1); this.tableLayoutPanel3.Controls.Add(this.button5, 2, 1);
@ -102,10 +102,10 @@
this.button6.Dock = System.Windows.Forms.DockStyle.Fill; 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.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.ForeColor = System.Drawing.Color.Black;
this.button6.Location = new System.Drawing.Point(1858, 14); this.button6.Location = new System.Drawing.Point(1857, 14);
this.button6.Margin = new System.Windows.Forms.Padding(14); this.button6.Margin = new System.Windows.Forms.Padding(14);
this.button6.Name = "button6"; this.button6.Name = "button6";
this.button6.Size = new System.Drawing.Size(676, 183); this.button6.Size = new System.Drawing.Size(677, 183);
this.button6.TabIndex = 7; this.button6.TabIndex = 7;
this.button6.Text = "手动打印箱单"; this.button6.Text = "手动打印箱单";
this.button6.UseVisualStyleBackColor = false; this.button6.UseVisualStyleBackColor = false;
@ -134,7 +134,7 @@
this.button5.Location = new System.Drawing.Point(1252, 225); this.button5.Location = new System.Drawing.Point(1252, 225);
this.button5.Margin = new System.Windows.Forms.Padding(14); this.button5.Margin = new System.Windows.Forms.Padding(14);
this.button5.Name = "button5"; this.button5.Name = "button5";
this.button5.Size = new System.Drawing.Size(578, 184); this.button5.Size = new System.Drawing.Size(577, 184);
this.button5.TabIndex = 5; this.button5.TabIndex = 5;
this.button5.Text = "不合格"; this.button5.Text = "不合格";
this.button5.UseVisualStyleBackColor = false; this.button5.UseVisualStyleBackColor = false;
@ -188,10 +188,10 @@
this.button7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); 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.Dock = System.Windows.Forms.DockStyle.Fill;
this.button7.Font = new System.Drawing.Font("黑体", 16F); this.button7.Font = new System.Drawing.Font("黑体", 16F);
this.button7.Location = new System.Drawing.Point(1850, 217); this.button7.Location = new System.Drawing.Point(1849, 217);
this.button7.Margin = new System.Windows.Forms.Padding(6); this.button7.Margin = new System.Windows.Forms.Padding(6);
this.button7.Name = "button7"; this.button7.Name = "button7";
this.button7.Size = new System.Drawing.Size(692, 200); this.button7.Size = new System.Drawing.Size(693, 200);
this.button7.TabIndex = 8; this.button7.TabIndex = 8;
this.button7.Text = "补打箱单"; this.button7.Text = "补打箱单";
this.button7.UseVisualStyleBackColor = false; this.button7.UseVisualStyleBackColor = false;
@ -203,7 +203,7 @@
this.label7.Dock = System.Windows.Forms.DockStyle.Fill; 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.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.ForeColor = System.Drawing.Color.White;
this.label7.Location = new System.Drawing.Point(1527, 3); this.label7.Location = new System.Drawing.Point(1525, 3);
this.label7.Margin = new System.Windows.Forms.Padding(2); this.label7.Margin = new System.Windows.Forms.Padding(2);
this.label7.Name = "label7"; this.label7.Name = "label7";
this.tableLayoutPanel4.SetRowSpan(this.label7, 2); this.tableLayoutPanel4.SetRowSpan(this.label7, 2);
@ -215,10 +215,10 @@
// //
this.textBox2.Dock = System.Windows.Forms.DockStyle.Fill; 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.Font = new System.Drawing.Font("黑体", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.textBox2.Location = new System.Drawing.Point(440, 127); this.textBox2.Location = new System.Drawing.Point(439, 127);
this.textBox2.Margin = new System.Windows.Forms.Padding(4); this.textBox2.Margin = new System.Windows.Forms.Padding(4);
this.textBox2.Name = "textBox2"; this.textBox2.Name = "textBox2";
this.textBox2.Size = new System.Drawing.Size(1080, 87); this.textBox2.Size = new System.Drawing.Size(1079, 87);
this.textBox2.TabIndex = 30; this.textBox2.TabIndex = 30;
this.textBox2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox2_KeyDown); this.textBox2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox2_KeyDown);
// //
@ -230,7 +230,7 @@
this.label3.Location = new System.Drawing.Point(5, 123); this.label3.Location = new System.Drawing.Point(5, 123);
this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(426, 125); this.label3.Size = new System.Drawing.Size(425, 125);
this.label3.TabIndex = 29; this.label3.TabIndex = 29;
this.label3.Text = "扫描物料条码"; this.label3.Text = "扫描物料条码";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -240,10 +240,10 @@
this.labOrderNo.Dock = System.Windows.Forms.DockStyle.Fill; 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.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.ForeColor = System.Drawing.Color.White;
this.labOrderNo.Location = new System.Drawing.Point(1804, 251); this.labOrderNo.Location = new System.Drawing.Point(1802, 251);
this.labOrderNo.Margin = new System.Windows.Forms.Padding(2); this.labOrderNo.Margin = new System.Windows.Forms.Padding(2);
this.labOrderNo.Name = "labOrderNo"; this.labOrderNo.Name = "labOrderNo";
this.labOrderNo.Size = new System.Drawing.Size(745, 175); this.labOrderNo.Size = new System.Drawing.Size(747, 175);
this.labOrderNo.TabIndex = 28; this.labOrderNo.TabIndex = 28;
this.labOrderNo.Text = "A64654646464"; this.labOrderNo.Text = "A64654646464";
this.labOrderNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labOrderNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -254,7 +254,7 @@
this.label4.Dock = System.Windows.Forms.DockStyle.Fill; 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.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.ForeColor = System.Drawing.Color.White;
this.label4.Location = new System.Drawing.Point(1527, 251); this.label4.Location = new System.Drawing.Point(1525, 251);
this.label4.Margin = new System.Windows.Forms.Padding(2); this.label4.Margin = new System.Windows.Forms.Padding(2);
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(272, 175); this.label4.Size = new System.Drawing.Size(272, 175);
@ -268,10 +268,10 @@
this.labStationNo.Dock = System.Windows.Forms.DockStyle.Fill; 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.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.ForeColor = System.Drawing.Color.White;
this.labStationNo.Location = new System.Drawing.Point(438, 251); this.labStationNo.Location = new System.Drawing.Point(437, 251);
this.labStationNo.Margin = new System.Windows.Forms.Padding(2); this.labStationNo.Margin = new System.Windows.Forms.Padding(2);
this.labStationNo.Name = "labStationNo"; this.labStationNo.Name = "labStationNo";
this.labStationNo.Size = new System.Drawing.Size(1084, 175); this.labStationNo.Size = new System.Drawing.Size(1083, 175);
this.labStationNo.TabIndex = 26; this.labStationNo.TabIndex = 26;
this.labStationNo.Text = "V253-MF-S后保下部延伸焊接"; this.labStationNo.Text = "V253-MF-S后保下部延伸焊接";
this.labStationNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labStationNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -285,7 +285,7 @@
this.label2.Location = new System.Drawing.Point(3, 251); this.label2.Location = new System.Drawing.Point(3, 251);
this.label2.Margin = new System.Windows.Forms.Padding(2); this.label2.Margin = new System.Windows.Forms.Padding(2);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(430, 175); this.label2.Size = new System.Drawing.Size(429, 175);
this.label2.TabIndex = 25; this.label2.TabIndex = 25;
this.label2.Text = "工位名称"; this.label2.Text = "工位名称";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -295,10 +295,10 @@
this.labPName.Dock = System.Windows.Forms.DockStyle.Fill; 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.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.ForeColor = System.Drawing.Color.White;
this.labPName.Location = new System.Drawing.Point(1804, 431); this.labPName.Location = new System.Drawing.Point(1802, 431);
this.labPName.Margin = new System.Windows.Forms.Padding(2); this.labPName.Margin = new System.Windows.Forms.Padding(2);
this.labPName.Name = "labPName"; this.labPName.Name = "labPName";
this.labPName.Size = new System.Drawing.Size(745, 286); this.labPName.Size = new System.Drawing.Size(747, 286);
this.labPName.TabIndex = 24; this.labPName.TabIndex = 24;
this.labPName.Text = "MF253 MF S后保"; this.labPName.Text = "MF253 MF S后保";
this.labPName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labPName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -309,7 +309,7 @@
this.label8.Dock = System.Windows.Forms.DockStyle.Fill; 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.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.ForeColor = System.Drawing.Color.White;
this.label8.Location = new System.Drawing.Point(1527, 431); this.label8.Location = new System.Drawing.Point(1525, 431);
this.label8.Margin = new System.Windows.Forms.Padding(2); this.label8.Margin = new System.Windows.Forms.Padding(2);
this.label8.Name = "label8"; this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(272, 286); this.label8.Size = new System.Drawing.Size(272, 286);
@ -323,10 +323,10 @@
this.labPartNo.Dock = System.Windows.Forms.DockStyle.Fill; 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.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.ForeColor = System.Drawing.Color.White;
this.labPartNo.Location = new System.Drawing.Point(438, 431); this.labPartNo.Location = new System.Drawing.Point(437, 431);
this.labPartNo.Margin = new System.Windows.Forms.Padding(2); this.labPartNo.Margin = new System.Windows.Forms.Padding(2);
this.labPartNo.Name = "labPartNo"; this.labPartNo.Name = "labPartNo";
this.labPartNo.Size = new System.Drawing.Size(1084, 286); this.labPartNo.Size = new System.Drawing.Size(1083, 286);
this.labPartNo.TabIndex = 22; this.labPartNo.TabIndex = 22;
this.labPartNo.Text = "A2530822665"; this.labPartNo.Text = "A2530822665";
this.labPartNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labPartNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -345,7 +345,7 @@
this.label6.Location = new System.Drawing.Point(3, 431); this.label6.Location = new System.Drawing.Point(3, 431);
this.label6.Margin = new System.Windows.Forms.Padding(2); this.label6.Margin = new System.Windows.Forms.Padding(2);
this.label6.Name = "label6"; this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(430, 286); this.label6.Size = new System.Drawing.Size(429, 286);
this.label6.TabIndex = 21; this.label6.TabIndex = 21;
this.label6.Text = "产品代码"; this.label6.Text = "产品代码";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -356,10 +356,10 @@
this.labBadCount.Dock = System.Windows.Forms.DockStyle.Fill; 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.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.ForeColor = System.Drawing.Color.Lime;
this.labBadCount.Location = new System.Drawing.Point(1804, 722); this.labBadCount.Location = new System.Drawing.Point(1802, 722);
this.labBadCount.Margin = new System.Windows.Forms.Padding(2); this.labBadCount.Margin = new System.Windows.Forms.Padding(2);
this.labBadCount.Name = "labBadCount"; this.labBadCount.Name = "labBadCount";
this.labBadCount.Size = new System.Drawing.Size(745, 513); this.labBadCount.Size = new System.Drawing.Size(747, 513);
this.labBadCount.TabIndex = 20; this.labBadCount.TabIndex = 20;
this.labBadCount.Text = "0"; this.labBadCount.Text = "0";
this.labBadCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labBadCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -370,10 +370,10 @@
this.labNum.Dock = System.Windows.Forms.DockStyle.Fill; 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.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.ForeColor = System.Drawing.Color.Lime;
this.labNum.Location = new System.Drawing.Point(438, 722); this.labNum.Location = new System.Drawing.Point(437, 722);
this.labNum.Margin = new System.Windows.Forms.Padding(2); this.labNum.Margin = new System.Windows.Forms.Padding(2);
this.labNum.Name = "labNum"; this.labNum.Name = "labNum";
this.labNum.Size = new System.Drawing.Size(1084, 513); this.labNum.Size = new System.Drawing.Size(1083, 513);
this.labNum.TabIndex = 18; this.labNum.TabIndex = 18;
this.labNum.Text = "152/210"; this.labNum.Text = "152/210";
this.labNum.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labNum.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -387,7 +387,7 @@
this.label10.Location = new System.Drawing.Point(3, 722); this.label10.Location = new System.Drawing.Point(3, 722);
this.label10.Margin = new System.Windows.Forms.Padding(2); this.label10.Margin = new System.Windows.Forms.Padding(2);
this.label10.Name = "label10"; this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(430, 513); this.label10.Size = new System.Drawing.Size(429, 513);
this.label10.TabIndex = 17; this.label10.TabIndex = 17;
this.label10.Text = "计划/完成数"; this.label10.Text = "计划/完成数";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -400,7 +400,7 @@
this.label14.Location = new System.Drawing.Point(5, 1); this.label14.Location = new System.Drawing.Point(5, 1);
this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label14.Name = "label14"; this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(426, 121); this.label14.Size = new System.Drawing.Size(425, 121);
this.label14.TabIndex = 12; this.label14.TabIndex = 12;
this.label14.Text = "扫描本体条码"; this.label14.Text = "扫描本体条码";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -409,10 +409,10 @@
// //
this.textBox1.Dock = System.Windows.Forms.DockStyle.Fill; 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.Font = new System.Drawing.Font("黑体", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.textBox1.Location = new System.Drawing.Point(440, 5); this.textBox1.Location = new System.Drawing.Point(439, 5);
this.textBox1.Margin = new System.Windows.Forms.Padding(4); this.textBox1.Margin = new System.Windows.Forms.Padding(4);
this.textBox1.Name = "textBox1"; this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(1080, 87); this.textBox1.Size = new System.Drawing.Size(1079, 87);
this.textBox1.TabIndex = 13; this.textBox1.TabIndex = 13;
this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown); 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.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.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.ForeColor = System.Drawing.Color.Red;
this.labErrMessage.Location = new System.Drawing.Point(1806, 1); this.labErrMessage.Location = new System.Drawing.Point(1804, 1);
this.labErrMessage.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.labErrMessage.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.labErrMessage.Name = "labErrMessage"; this.labErrMessage.Name = "labErrMessage";
this.tableLayoutPanel4.SetRowSpan(this.labErrMessage, 2); this.tableLayoutPanel4.SetRowSpan(this.labErrMessage, 2);
this.labErrMessage.Size = new System.Drawing.Size(741, 247); this.labErrMessage.Size = new System.Drawing.Size(743, 247);
this.labErrMessage.TabIndex = 16; this.labErrMessage.TabIndex = 16;
this.labErrMessage.Text = "条码与产品不匹配，重新扫描"; this.labErrMessage.Text = "条码与产品不匹配，重新扫描";
this.labErrMessage.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labErrMessage.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -438,7 +438,7 @@
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, 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.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, 276F));
this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 748F)); this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 750F));
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, 40F));
this.tableLayoutPanel4.Controls.Add(this.label7, 2, 0); this.tableLayoutPanel4.Controls.Add(this.label7, 2, 0);
this.tableLayoutPanel4.Controls.Add(this.textBox2, 1, 1); this.tableLayoutPanel4.Controls.Add(this.textBox2, 1, 1);
@ -478,7 +478,7 @@
this.label12.Dock = System.Windows.Forms.DockStyle.Fill; 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.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.ForeColor = System.Drawing.Color.White;
this.label12.Location = new System.Drawing.Point(1527, 722); this.label12.Location = new System.Drawing.Point(1525, 722);
this.label12.Margin = new System.Windows.Forms.Padding(2); this.label12.Margin = new System.Windows.Forms.Padding(2);
this.label12.Name = "label12"; this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(272, 513); this.label12.Size = new System.Drawing.Size(272, 513);
@ -491,10 +491,10 @@
this.labTime.BackColor = System.Drawing.Color.Transparent; this.labTime.BackColor = System.Drawing.Color.Transparent;
this.labTime.Dock = System.Windows.Forms.DockStyle.Fill; 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.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.labTime.Location = new System.Drawing.Point(1969, 0); this.labTime.Location = new System.Drawing.Point(1968, 0);
this.labTime.Margin = new System.Windows.Forms.Padding(0); this.labTime.Margin = new System.Windows.Forms.Padding(0);
this.labTime.Name = "labTime"; this.labTime.Name = "labTime";
this.labTime.Size = new System.Drawing.Size(591, 149); this.labTime.Size = new System.Drawing.Size(592, 149);
this.labTime.TabIndex = 7; this.labTime.TabIndex = 7;
this.labTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.labTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.labTime.Click += new System.EventHandler(this.labTime_Click); this.labTime.Click += new System.EventHandler(this.labTime_Click);
@ -521,7 +521,7 @@
this.label1.Location = new System.Drawing.Point(356, 0); this.label1.Location = new System.Drawing.Point(356, 0);
this.label1.Margin = new System.Windows.Forms.Padding(0); this.label1.Margin = new System.Windows.Forms.Padding(0);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(1613, 149); this.label1.Size = new System.Drawing.Size(1612, 149);
this.label1.TabIndex = 1; this.label1.TabIndex = 1;
this.label1.Text = "装配工位信息看板"; this.label1.Text = "装配工位信息看板";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -532,7 +532,7 @@
this.tableLayoutPanel2.ColumnCount = 3; 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, 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.Percent, 81.89349F));
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 590F)); this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 591F));
this.tableLayoutPanel2.Controls.Add(this.labTime, 2, 0); this.tableLayoutPanel2.Controls.Add(this.labTime, 2, 0);
this.tableLayoutPanel2.Controls.Add(this.pictureBox1, 0, 0); this.tableLayoutPanel2.Controls.Add(this.pictureBox1, 0, 0);
this.tableLayoutPanel2.Controls.Add(this.label1, 1, 0); this.tableLayoutPanel2.Controls.Add(this.label1, 1, 0);

82
InjectionPC/FrmMain2408.Designer.cs
View File

@ -29,10 +29,10 @@
private void InitializeComponent() private void InitializeComponent()
{ {
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
GlacialComponents.Controls.GLColumn glColumn1 = new GlacialComponents.Controls.GLColumn(); GlacialComponents.Controls.GLColumn glColumn5 = new GlacialComponents.Controls.GLColumn();
GlacialComponents.Controls.GLColumn glColumn2 = new GlacialComponents.Controls.GLColumn(); GlacialComponents.Controls.GLColumn glColumn6 = new GlacialComponents.Controls.GLColumn();
GlacialComponents.Controls.GLColumn glColumn3 = new GlacialComponents.Controls.GLColumn(); GlacialComponents.Controls.GLColumn glColumn7 = new GlacialComponents.Controls.GLColumn();
GlacialComponents.Controls.GLColumn glColumn4 = new GlacialComponents.Controls.GLColumn(); GlacialComponents.Controls.GLColumn glColumn8 = new GlacialComponents.Controls.GLColumn();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMain2408)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMain2408));
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.panel7 = new System.Windows.Forms.Panel(); this.panel7 = new System.Windows.Forms.Panel();
@ -732,43 +732,43 @@
this.glacialList1.AutoHeight = true; this.glacialList1.AutoHeight = true;
this.glacialList1.BackColor = System.Drawing.SystemColors.ControlLightLight; this.glacialList1.BackColor = System.Drawing.SystemColors.ControlLightLight;
this.glacialList1.BackgroundStretchToFit = true; this.glacialList1.BackgroundStretchToFit = true;
glColumn1.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None; glColumn5.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None;
glColumn1.CheckBoxes = false; glColumn5.CheckBoxes = false;
glColumn1.ImageIndex = -1; glColumn5.ImageIndex = -1;
glColumn1.Name = "条码"; glColumn5.Name = "条码";
glColumn1.NumericSort = false; glColumn5.NumericSort = false;
glColumn1.Text = "条码"; glColumn5.Text = "条码";
glColumn1.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; glColumn5.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
glColumn1.Width = 350; glColumn5.Width = 350;
glColumn2.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None; glColumn6.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None;
glColumn2.CheckBoxes = false; glColumn6.CheckBoxes = false;
glColumn2.ImageIndex = -1; glColumn6.ImageIndex = -1;
glColumn2.Name = "产品名称"; glColumn6.Name = "产品名称";
glColumn2.NumericSort = false; glColumn6.NumericSort = false;
glColumn2.Text = "产品名称"; glColumn6.Text = "产品名称";
glColumn2.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; glColumn6.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
glColumn2.Width = 320; glColumn6.Width = 320;
glColumn3.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None; glColumn7.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None;
glColumn3.CheckBoxes = false; glColumn7.CheckBoxes = false;
glColumn3.ImageIndex = -1; glColumn7.ImageIndex = -1;
glColumn3.Name = "打印方式"; glColumn7.Name = "打印方式";
glColumn3.NumericSort = false; glColumn7.NumericSort = false;
glColumn3.Text = "打印方式"; glColumn7.Text = "打印方式";
glColumn3.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; glColumn7.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
glColumn3.Width = 150; glColumn7.Width = 150;
glColumn4.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None; glColumn8.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None;
glColumn4.CheckBoxes = false; glColumn8.CheckBoxes = false;
glColumn4.ImageIndex = -1; glColumn8.ImageIndex = -1;
glColumn4.Name = "打印时间"; glColumn8.Name = "打印时间";
glColumn4.NumericSort = false; glColumn8.NumericSort = false;
glColumn4.Text = "打印时间"; glColumn8.Text = "打印时间";
glColumn4.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft; glColumn8.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
glColumn4.Width = 270; glColumn8.Width = 270;
this.glacialList1.Columns.AddRange(new GlacialComponents.Controls.GLColumn[] { this.glacialList1.Columns.AddRange(new GlacialComponents.Controls.GLColumn[] {
glColumn1, glColumn5,
glColumn2, glColumn6,
glColumn3, glColumn7,
glColumn4}); glColumn8});
this.glacialList1.ControlStyle = GlacialComponents.Controls.GLControlStyles.Normal; this.glacialList1.ControlStyle = GlacialComponents.Controls.GLControlStyles.Normal;
this.glacialList1.Dock = System.Windows.Forms.DockStyle.Fill; this.glacialList1.Dock = System.Windows.Forms.DockStyle.Fill;
this.glacialList1.Font = new System.Drawing.Font("宋体", 15.75F); this.glacialList1.Font = new System.Drawing.Font("宋体", 15.75F);
@ -1044,7 +1044,6 @@
this.comBoxSizeR.Name = "comBoxSizeR"; this.comBoxSizeR.Name = "comBoxSizeR";
this.comBoxSizeR.Size = new System.Drawing.Size(136, 72); this.comBoxSizeR.Size = new System.Drawing.Size(136, 72);
this.comBoxSizeR.TabIndex = 3; this.comBoxSizeR.TabIndex = 3;
this.comBoxSizeR.SelectedValueChanged += new System.EventHandler(this.comBoxSizeR_SelectedValueChanged);
// //
// panel36 // panel36
// //
@ -1244,7 +1243,6 @@
this.comBoxSizeL.Name = "comBoxSizeL"; this.comBoxSizeL.Name = "comBoxSizeL";
this.comBoxSizeL.Size = new System.Drawing.Size(136, 72); this.comBoxSizeL.Size = new System.Drawing.Size(136, 72);
this.comBoxSizeL.TabIndex = 3; this.comBoxSizeL.TabIndex = 3;
this.comBoxSizeL.SelectedValueChanged += new System.EventHandler(this.comBoxSize_SelectedValueChanged);
// //
// panel8 // panel8
// //

144
InjectionPC/FrmMain2408.cs
View File

@ -248,6 +248,9 @@ namespace InjectionPC
finally finally
{ {
_isLoad = true; _isLoad = true;
comBoxSizeL.SelectedValueChanged += comBoxSizeL_SelectedValueChanged;
comBoxSizeR.SelectedValueChanged += comBoxSizeR_SelectedValueChanged;
} }
} }
@ -258,6 +261,7 @@ namespace InjectionPC
return bill.SearchAllInfo(_currentStationID); return bill.SearchAllInfo(_currentStationID);
} }
List<string> _lastParts = new List<string>();
private void initPlan() private void initPlan()
{ {
try try
@ -291,25 +295,49 @@ namespace InjectionPC
if (sdt != null && sdt.Rows.Count > 0) if (sdt != null && sdt.Rows.Count > 0)
{ {
label12.Text += "零件号" + partNo[i].ToString().Trim() + ",零件名称" + sdt.Rows[0]["ProductName"].ToString() + ";"; label12.Text += "零件号" + partNo[i].ToString().Trim() + ",零件名称" + sdt.Rows[0]["ProductName"].ToString() + ";";
} }
if (!string.IsNullOrEmpty(partNo[i].ToString().Trim())) if (!string.IsNullOrEmpty(partNo[i].ToString().Trim()))
{ {
string currentSize = string.Empty; if (_lastParts.Contains(partNo[i].ToString().Trim()) == false)
List<string> list = GetProductBoxSize(partNo[i].ToString().Trim(), ref currentSize);
if(i == 0)
{ {
comBoxSizeL.DataSource = list; string currentSize = string.Empty;
comBoxSizeL.SelectedItem = currentSize; List<string> list = GetProductBoxSize(partNo[i].ToString().Trim(), ref currentSize);
}
else if (i == 0)
{ {
comBoxSizeR.DataSource = list; comBoxSizeL.DataSource = list;
comBoxSizeR.SelectedItem = currentSize; comBoxSizeL.SelectedItem = currentSize;
_selectItemL = currentSize;
int j = 0;
int.TryParse(currentSize, out j);
if (j > 0)
{
lbNeedQtyL.Text = j.ToString();
}
}
else
{
comBoxSizeR.DataSource = list;
comBoxSizeR.SelectedItem = currentSize;
_selectItemR = currentSize;
int j = 0;
int.TryParse(currentSize, out j);
if (j > 0)
{
lbNeedQtyR.Text = j.ToString();
}
}
} }
} }
if(_lastParts.Contains(partNo[i].ToString().Trim()) == false)
{
_lastParts.Add(partNo[i].ToString().Trim());
}
} }
} }
else else
@ -3184,6 +3212,8 @@ namespace InjectionPC
panel44.Visible = false; panel44.Visible = false;
textBox3.Text = ""; textBox3.Text = "";
} }
} }
else else
@ -4180,7 +4210,11 @@ namespace InjectionPC
} }
} }
/// <summary>
/// 每隔几秒,连接一下服务器,刷新一下当前计划
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void timer3_Tick(object sender, EventArgs e) private void timer3_Tick(object sender, EventArgs e)
{ {
try try
@ -4203,51 +4237,53 @@ namespace InjectionPC
textBox1.Text = Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) + textBox1.Text = Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) +
Program.ProductDate.Substring(8, 2); //批次 Program.ProductDate.Substring(8, 2); //批次
initPlan();
#region 获取当前生产信息 #region 获取当前生产信息
InjectionPlanBLL ibll = new InjectionPlanBLL(); //InjectionPlanBLL ibll = new InjectionPlanBLL();
ProductBLL productBll = new ProductBLL(); //ProductBLL productBll = new ProductBLL();
DataTable dt = ibll.SearchInfoByName(Program.station); //DataTable dt = ibll.SearchInfoByName(Program.station);
if (dt != null && dt.Rows.Count > 0) //if (dt != null && dt.Rows.Count > 0)
{ //{
planID = dt.Rows[0]["InjectionPlanID"].ToString(); // planID = dt.Rows[0]["InjectionPlanID"].ToString();
string[] partNo1 = dt.Rows[0]["PartNo"].ToString().Split(','); // string[] partNo1 = dt.Rows[0]["PartNo"].ToString().Split(',');
label12.Text = "当前生产计划为:"; // label12.Text = "当前生产计划为:";
for (int i = 0; i < partNo1.Length; i++) // for (int i = 0; i < partNo1.Length; i++)
{ // {
DataTable dt2 = productBll.SearchInfoByPartNo(partNo1[i].ToString().Trim()); // DataTable dt2 = productBll.SearchInfoByPartNo(partNo1[i].ToString().Trim());
if (dt2 != null && dt2.Rows.Count > 0) // if (dt2 != null && dt2.Rows.Count > 0)
{ // {
label12.Text += "零件号" + partNo1[i].ToString().Trim() + ",零件名称" + dt2.Rows[0]["ProductName"].ToString() + ";"; // label12.Text += "零件号" + partNo1[i].ToString().Trim() + ",零件名称" + dt2.Rows[0]["ProductName"].ToString() + ";";
} // }
if((partNo1.Length == 1 && comBoxSizeL.SelectedItem == null) || (partNo1.Length == 2 && comBoxSizeL.SelectedItem == null && comBoxSizeR.SelectedItem == null)) // if ((partNo1.Length == 1 && comBoxSizeL.SelectedItem == null) || (partNo1.Length == 2 && comBoxSizeL.SelectedItem == null && comBoxSizeR.SelectedItem == null))
{ // {
if (!string.IsNullOrEmpty(partNo1[i].ToString().Trim())) // if (!string.IsNullOrEmpty(partNo1[i].ToString().Trim()))
{ // {
string currentSize = string.Empty; // string currentSize = string.Empty;
List<string> list = GetProductBoxSize(partNo1[i].ToString().Trim(), ref currentSize); // List<string> list = GetProductBoxSize(partNo1[i].ToString().Trim(), ref currentSize);
// if (i == 0)
// {
// comBoxSizeL.DataSource = list;
// comBoxSizeL.SelectedItem = currentSize;
// }
// else
// {
// comBoxSizeR.DataSource = list;
// comBoxSizeR.SelectedItem = currentSize;
// }
// }
// }
if (i == 0) // }
{ //}
comBoxSizeL.DataSource = list; //else
comBoxSizeL.SelectedItem = currentSize; //{
} // label12.Text = "暂无生产计划";
else //}
{
comBoxSizeR.DataSource = list;
comBoxSizeR.SelectedItem = currentSize;
}
}
}
}
}
else
{
label12.Text = "暂无生产计划";
}
#endregion #endregion
} }
@ -4654,7 +4690,7 @@ namespace InjectionPC
private object _selectItemR = null; private object _selectItemR = null;
bool _isShowHintR = true; bool _isShowHintR = true;
private void comBoxSize_SelectedValueChanged(object sender, EventArgs e) private void comBoxSizeL_SelectedValueChanged(object sender, EventArgs e)
{ {
//TimeSpan interval = DateTime.Now - _loginTime; //TimeSpan interval = DateTime.Now - _loginTime;
//if (interval.Minutes > 0) //if (interval.Minutes > 0)

4
InjectionPC/FrmQuality.cs
View File

@ -197,6 +197,10 @@ namespace InjectionPC
} }
GetBadCount(); GetBadCount();
if (!string.IsNullOrEmpty(txtScanBarCode.Text))
{
textBox3_KeyDown(null, new KeyEventArgs( Keys.Enter));
}
} }

37
InjectionPC/Sill.grf
View File

@ -31,6 +31,9 @@
}, },
{ {
"Name":"BarCode" "Name":"BarCode"
},
{
"Name":"Station"
} }
], ],
"ReportHeader":[ "ReportHeader":[
@ -53,26 +56,11 @@
}, },
"Text":"[#PrintTime#]" "Text":"[#PrintTime#]"
}, },
{
"Type":"StaticBox",
"Name":"StaticBox1",
"Left":0.714375,
"Top":0.635,
"Width":1.21708,
"Height":0.211667,
"Font":{
"Name":"宋体",
"Size":52500,
"Bold":true,
"Charset":134
},
"Text":"IM02"
},
{ {
"Type":"MemoBox", "Type":"MemoBox",
"Name":"MemoBox2", "Name":"MemoBox2",
"Left":0.58, "Left":0.58,
"Top":0.873125, "Top":1.00542,
"Width":1.59, "Width":1.59,
"Height":0.4, "Height":0.4,
"Font":{ "Font":{
@ -87,7 +75,7 @@
"Type":"MemoBox", "Type":"MemoBox",
"Name":"MemoBox3", "Name":"MemoBox3",
"Left":0.582083, "Left":0.582083,
"Top":1.27, "Top":1.40229,
"Width":2.2225, "Width":2.2225,
"Height":0.396875, "Height":0.396875,
"Font":{ "Font":{
@ -125,6 +113,21 @@
"BarcodeType":"QRCode", "BarcodeType":"QRCode",
"CaptionPosition":"None", "CaptionPosition":"None",
"Text":"[#{OneBarCode}#]" "Text":"[#{OneBarCode}#]"
},
{
"Type":"MemoBox",
"Name":"MemoBox4",
"Left":0.608542,
"Top":0.608542,
"Width":1.5875,
"Height":0.396875,
"Font":{
"Name":"宋体",
"Size":52500,
"Bold":true,
"Charset":134
},
"Text":"[#{Station}#]"
} }
] ]
} }

BIN
InjectionPC/单个条码2.grf
View File

Binary file not shown.

9
InjectionSearch/FrmBarCodeSearch2408.cs
View File

@ -1123,7 +1123,14 @@ namespace InjectionSearch
rp.Report.Print(false); rp.Report.Print(false);
if (pnBoxReprint.Visible == true)
{
pnBoxReprint.Visible = false;
}
else
{
pnBoxReprint.Visible = true;
}
} }
private void UpdateBoxRecordPrintState(string UpdatePrinted) private void UpdateBoxRecordPrintState(string UpdatePrinted)
{ {

2
MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs
View File

@ -535,7 +535,7 @@ namespace MESClassLibrary.DAL.BasicInfo
// dbo.tb_Station ON dbo.tb_BarCode.StationID = dbo.tb_Station.StationID // dbo.tb_Station ON dbo.tb_BarCode.StationID = dbo.tb_Station.StationID
// WHERE dbo.tb_BarCode.IsDel = 0 and dbo.tb_BarCode.BarCode=@BarCode // WHERE dbo.tb_BarCode.IsDel = 0 and dbo.tb_BarCode.BarCode=@BarCode
// ORDER BY dbo.tb_BarCode.CreateTime DESC"; // ORDER BY dbo.tb_BarCode.CreateTime DESC";
string sql = @"SELECT dbo.v_Code.BarCode, dbo.tb_Product.ProductName, string sql = @"SELECT dbo.v_Code.BarCode, dbo.tb_Product.ProductName, dbo.v_Code.BoxNo, dbo.v_Code.TableName,
CASE dbo.v_Code.PrintType WHEN 0 THEN '自动打印' WHEN 1 THEN '手动打印' WHEN 2 THEN '补打' END AS PrintType, CASE dbo.v_Code.PrintType WHEN 0 THEN '自动打印' WHEN 1 THEN '手动打印' WHEN 2 THEN '补打' END AS PrintType,
dbo.v_Code.PrintTime, dbo.v_Code.OneBarCode,dbo.v_Code.PlanID, dbo.v_Code.PrintTime, dbo.v_Code.OneBarCode,dbo.v_Code.PlanID,
dbo.tb_InjectPlanReport.MaterialName, dbo.tb_InjectPlanReport.BatchNo dbo.tb_InjectPlanReport.MaterialName, dbo.tb_InjectPlanReport.BatchNo

51
WebService/Function.cs
View File

@ -1087,12 +1087,12 @@ namespace Webservice
([ID] ([ID]
,[barcode] ,[barcode]
,[pass] ,[pass]
,[createTime]) ,[createTime],Repaint)
VALUES VALUES
((select newid()) ((select newid())
,'" + barcode + @"' ,'" + barcode + @"'
,'" + isPass.ToString() + @"' ,'" + isPass.ToString() + @"'
,(select getdate())) "; ,(select getdate()),'"+ repaint + "') ";
SqlHelper.ExecuteNonQuery(SqlHelper.SqlConnString, CommandType.Text, sql, null); SqlHelper.ExecuteNonQuery(SqlHelper.SqlConnString, CommandType.Text, sql, null);
model.Result = "1"; model.Result = "1";
@ -1122,7 +1122,7 @@ namespace Webservice
} }
} }
/// <summary> /// <summary>
/// /// 是否允许发送给wms 是否质检等判断
/// </summary> /// </summary>
/// <param name="oneBarCode"></param> /// <param name="oneBarCode"></param>
/// <param name="state">0-不合格;1-合格</param> /// <param name="state">0-不合格;1-合格</param>
@ -1187,7 +1187,7 @@ namespace Webservice
errorMssg = $"条码[{oneBarCode}]质检记录是[{inspectTable.Rows[0]["inspectResult"].ToString()}]状态,无法合格报工."; errorMssg = $"条码[{oneBarCode}]质检记录是[{inspectTable.Rows[0]["inspectResult"].ToString()}]状态,无法合格报工.";
return false; return false;
} }
if (rePaint == 0) if (rePaint == 0) //没返喷的合格,
{ {
if (IsStockInAll(oneBarCode)) if (IsStockInAll(oneBarCode))
{ {
@ -1200,6 +1200,19 @@ namespace Webservice
return false; return false;
} }
} }
else //存在返喷的合格
{
if (IsStockInAll(oneBarCode,true))
{
string lastRst = inspectTable.Rows[0]["inspectResult"].ToString();
if (lastRst.Contains("报废")) //允许报废转合格
{
return true;
}
errorMssg = $"条码[{oneBarCode}]存在返喷报工,不能重新报工.";
return false;
}
}
} }
@ -1263,11 +1276,15 @@ namespace Webservice
} }
} }
public static bool IsStockInAll(string barcode) public static bool IsStockInAll(string barcode,bool isRepaint = false)
{ {
try try
{ {
string sql = @" select * from tb_StockIn where barcode = '" + barcode + "' "; string sql = @" select * from tb_StockIn where barcode = '" + barcode + "' ";
if(isRepaint == true)
{
sql = @" select * from tb_StockIn where barcode = '" + barcode + "' and (Repaint=2 or Repaint=1) ";
}
DataTable dt = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null); DataTable dt = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null);
if (dt != null && dt.Rows.Count > 0) if (dt != null && dt.Rows.Count > 0)
{ {
@ -2345,6 +2362,30 @@ namespace Webservice
return ex.Message; return ex.Message;
} }
} }
public static bool ExsitBarCodeInDownRecord(string barcode)
{
DataTable res = new DataTable();
try
{
string sql = @"
select * from tb_ChainDown where barcode = '" + barcode + @"'
";
res = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null);
return res.Rows.Count > 0;
}
catch (Exception ex)
{
LogHelper.WriteLogManager(ex);
LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name);
return false;
}
}
#endregion #endregion
#region TruckBox #region TruckBox

58
WebService/WMSWebService.asmx.cs
View File

@ -72,7 +72,7 @@ namespace Webservice
//string res = Function.WMSSpraying("60000000562010090015", 1, "6000000056", "86511-BU020RBC", "210721"); //string res = Function.WMSSpraying("60000000562010090015", 1, "6000000056", "86511-BU020RBC", "210721");
string res = Function.WMSSpraying(barcode, 1, stcokNo, partNo, batchNo,ref colorName,ref productName,ref carType); string res = Function.WMSSpraying(barcode, 1, stcokNo, partNo, batchNo, ref colorName, ref productName, ref carType);
LogHelper.WriteSysLogBase("WMS接口：条码：" + barcode + "，MES返回结果：" + res, MethodBase.GetCurrentMethod().Name); LogHelper.WriteSysLogBase("WMS接口：条码：" + barcode + "，MES返回结果：" + res, MethodBase.GetCurrentMethod().Name);
@ -127,7 +127,7 @@ namespace Webservice
/// </summary> /// </summary>
/// <param name="barCode"></param> /// <param name="barCode"></param>
/// <returns></returns> /// <returns></returns>
[WebMethod] [WebMethod(EnableSession = true)]
public string PaintLineDown(string barCode) public string PaintLineDown(string barCode)
{ {
bool sendRst = true; bool sendRst = true;
@ -135,37 +135,50 @@ namespace Webservice
string productName = string.Empty; string productName = string.Empty;
string carType = string.Empty; string carType = string.Empty;
string stcokNo = string.Empty; string stcokNo = string.Empty;
string batchNo = string.Empty; string batchNo = string.Empty;
string partNo = string.Empty; string partNo = string.Empty;
try try
{ {
sendRst = SendToWmsService(barCode,ref stcokNo,ref batchNo,ref partNo,ref colorName,ref productName,ref carType); sendRst = SendToWmsService(barCode, ref stcokNo, ref batchNo, ref partNo, ref colorName, ref productName, ref carType);
if(sendRst == true) if (sendRst == true)
{ {
Function.SaveLineDownInfo(barCode, carType, colorName, productName); Function.SaveLineDownInfo(barCode, carType, colorName, productName);
if (Session["LastBarCode"] != null) if (Context.Session["LastBarCode"] != null)
{ {
Function.SaveLineDownInfo(Session["LastBarCode"].ToString(), Session["LastCarType"].ToString(), Session["LastColorName"].ToString(), Session["LastProductName"].ToString()); if (ExsitBarCode(Context.Session["LastBarCode"].ToString()) == false)
{
Function.SaveLineDownInfo(Context.Session["LastBarCode"].ToString(), Context.Session["LastCarType"].ToString(), Context.Session["LastColorName"].ToString(), Context.Session["LastProductName"].ToString());
}
} }
Session["LastBarCode"] = barCode; Context.Session["LastBarCode"] = barCode;
Session["LastCarType"] = carType; Context.Session["LastCarType"] = carType;
Session["LastColorName"] = colorName; Context.Session["LastColorName"] = colorName;
Session["LastProductName"] = productName; Context.Session["LastProductName"] = productName;
return "操作成功!"; return "操作成功!";
} }
else else
{ {
return "发送到WMS接口失败,请重新操作."; return "发送到WMS接口失败,请重新操作.";
} }
} }
catch(Exception ex) catch (Exception ex)
{ {
return ex.Message; return ex.Message;
} }
} }
/// <summary>
/// 下悬挂链记录,是否存在该条码
/// </summary>
/// <param name="v"></param>
/// <returns></returns>
private bool ExsitBarCode(string barCode)
{
return Function.ExsitBarCodeInDownRecord(barCode);
}
bool SendToWmsService(string barCode, ref string stcokNo, ref string batchNo, ref string partNo, ref string colorName, ref string productName, ref string carType) bool SendToWmsService(string barCode, ref string stcokNo, ref string batchNo, ref string partNo, ref string colorName, ref string productName, ref string carType)
{ {
string errorMsg = string.Empty; string errorMsg = string.Empty;
@ -174,24 +187,24 @@ namespace Webservice
#region 参数判断 #region 参数判断
if (string.IsNullOrWhiteSpace(barCode)) if (string.IsNullOrWhiteSpace(barCode))
{ {
throw new Exception ("条码号不能为空"); throw new Exception("条码号不能为空");
} }
Function.GetCode(barCode, out stcokNo, out batchNo, out partNo); Function.GetCode(barCode, out stcokNo, out batchNo, out partNo);
if (string.IsNullOrWhiteSpace(stcokNo) && string.IsNullOrWhiteSpace(partNo)) if (string.IsNullOrWhiteSpace(stcokNo) && string.IsNullOrWhiteSpace(partNo))
{ {
throw new Exception("条码号无效，请检查条码是否破损缺失"); throw new Exception("条码号无效，请检查条码是否破损缺失");
} }
#endregion #endregion
string res = Function.WMSSpraying(barCode, 1, stcokNo, partNo, batchNo, ref colorName, ref productName, ref carType); string res = Function.WMSSpraying(barCode, 1, stcokNo, partNo, batchNo, ref colorName, ref productName, ref carType);
JsonModel<NoModel> model = JSONTools.ScriptDeserialize<JsonModel<NoModel>>(res); JsonModel<NoModel> model = JSONTools.ScriptDeserialize<JsonModel<NoModel>>(res);
if (model.Result == "0") if (model.Result == "0")
{ {
throw new Exception(model.ErrReason); throw new Exception(model.ErrReason);
} }
return true; return true;
} }
@ -362,11 +375,12 @@ namespace Webservice
/// <returns></returns> /// <returns></returns>
[WebMethod] [WebMethod]
[ScriptMethod(UseHttpGet = true, ResponseFormat = ResponseFormat.Json)] [ScriptMethod(UseHttpGet = true, ResponseFormat = ResponseFormat.Json)]
public bool WMSInterfaceStockIn(string barcode, string partNo, string batchNo, int isOK,int LineId) public bool WMSInterfaceStockIn(string barcode, string partNo, string batchNo, int isOK, int LineId)
{ {
bool res = false; bool res = false;
res = Function.WMSInterfaceStockIn(barcode, partNo, batchNo, isOK,LineId); res = Function.WMSInterfaceStockIn(barcode, partNo, batchNo, isOK, LineId);
return res; return res;
} }
} }
} }

Write Preview
Loading…
Cancel
Save