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

注塑的相关修改

master
ruoxing.wang 2 weeks ago
parent
65df1122dc
commit
c119060267
13 changed files with 309 additions and 151 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. 94
      FacOneZPStation/FrmZP.Designer.cs
  2. 3
      InjectionPC/FrmLogin.cs
  3. 9
      InjectionPC/FrmMain.Designer.cs
  4. 82
      InjectionPC/FrmMain2408.Designer.cs
  5. 26
      InjectionPC/FrmMain2408.cs
  6. 82
      InjectionPC/FrmMain2411.Designer.cs
  7. 20
      InjectionPC/FrmMain2411.cs
  8. 42
      InjectionPC/FrmQuality.cs
  9. 9
      MESClassLibrary/BLL/BasicInfo/BadInjectionBLL.cs
  10. 41
      MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs
  11. 5
      MESClassLibrary/BLL/Wms/WmsBLL.cs
  12. 21
      MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs
  13. 26
      MESClassLibrary/DAL/Wms/WmsDAL.cs

94
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, 659F)); this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 662F));
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(1687, 12); this.button6.Location = new System.Drawing.Point(1684, 12);
this.button6.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12); this.button6.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
this.button6.Name = "button6"; this.button6.Name = "button6";
this.button6.Size = new System.Drawing.Size(635, 161); this.button6.Size = new System.Drawing.Size(638, 161);
this.button6.TabIndex = 7; this.button6.TabIndex = 7;
this.button6.Text = "手动打印箱单"; this.button6.Text = "手动打印箱单";
this.button6.UseVisualStyleBackColor = false; this.button6.UseVisualStyleBackColor = false;
@ -119,7 +119,7 @@
this.button1.Location = new System.Drawing.Point(6, 190); this.button1.Location = new System.Drawing.Point(6, 190);
this.button1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.button1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.button1.Name = "button1"; this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(549, 176); this.button1.Size = new System.Drawing.Size(548, 176);
this.button1.TabIndex = 6; this.button1.TabIndex = 6;
this.button1.Text = "打印标签"; this.button1.Text = "打印标签";
this.button1.UseVisualStyleBackColor = false; this.button1.UseVisualStyleBackColor = false;
@ -131,10 +131,10 @@
this.button5.Dock = System.Windows.Forms.DockStyle.Fill; 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.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.ForeColor = System.Drawing.Color.Black;
this.button5.Location = new System.Drawing.Point(1137, 197); this.button5.Location = new System.Drawing.Point(1135, 197);
this.button5.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12); this.button5.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
this.button5.Name = "button5"; this.button5.Name = "button5";
this.button5.Size = new System.Drawing.Size(524, 162); this.button5.Size = new System.Drawing.Size(523, 162);
this.button5.TabIndex = 5; this.button5.TabIndex = 5;
this.button5.Text = "不合格"; this.button5.Text = "不合格";
this.button5.UseVisualStyleBackColor = false; this.button5.UseVisualStyleBackColor = false;
@ -145,10 +145,10 @@
this.button4.BackColor = System.Drawing.Color.RoyalBlue; this.button4.BackColor = System.Drawing.Color.RoyalBlue;
this.button4.Dock = System.Windows.Forms.DockStyle.Fill; this.button4.Dock = System.Windows.Forms.DockStyle.Fill;
this.button4.Font = new System.Drawing.Font("黑体", 16F); this.button4.Font = new System.Drawing.Font("黑体", 16F);
this.button4.Location = new System.Drawing.Point(567, 5); this.button4.Location = new System.Drawing.Point(566, 5);
this.button4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.button4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.button4.Name = "button4"; this.button4.Name = "button4";
this.button4.Size = new System.Drawing.Size(551, 175); this.button4.Size = new System.Drawing.Size(550, 175);
this.button4.TabIndex = 4; this.button4.TabIndex = 4;
this.button4.Text = "下一计划"; this.button4.Text = "下一计划";
this.button4.UseVisualStyleBackColor = false; this.button4.UseVisualStyleBackColor = false;
@ -162,7 +162,7 @@
this.button3.Location = new System.Drawing.Point(6, 5); this.button3.Location = new System.Drawing.Point(6, 5);
this.button3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.button3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.button3.Name = "button3"; this.button3.Name = "button3";
this.button3.Size = new System.Drawing.Size(549, 175); this.button3.Size = new System.Drawing.Size(548, 175);
this.button3.TabIndex = 3; this.button3.TabIndex = 3;
this.button3.Text = "上一计划"; this.button3.Text = "上一计划";
this.button3.UseVisualStyleBackColor = false; this.button3.UseVisualStyleBackColor = false;
@ -174,10 +174,10 @@
this.button2.Dock = System.Windows.Forms.DockStyle.Fill; 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.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.ForeColor = System.Drawing.Color.Black;
this.button2.Location = new System.Drawing.Point(574, 197); this.button2.Location = new System.Drawing.Point(573, 197);
this.button2.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12); this.button2.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
this.button2.Name = "button2"; this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(537, 162); this.button2.Size = new System.Drawing.Size(536, 162);
this.button2.TabIndex = 2; this.button2.TabIndex = 2;
this.button2.Text = "补打标签"; this.button2.Text = "补打标签";
this.button2.UseVisualStyleBackColor = false; 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.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(1680, 190); this.button7.Location = new System.Drawing.Point(1677, 190);
this.button7.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.button7.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.button7.Name = "button7"; this.button7.Name = "button7";
this.button7.Size = new System.Drawing.Size(649, 176); this.button7.Size = new System.Drawing.Size(652, 176);
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(1378, 3); this.label7.Location = new System.Drawing.Point(1374, 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(397, 111); this.textBox2.Location = new System.Drawing.Point(396, 111);
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(974, 77); this.textBox2.Size = new System.Drawing.Size(971, 77);
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, 107); this.label3.Location = new System.Drawing.Point(5, 107);
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(383, 109); this.label3.Size = new System.Drawing.Size(382, 109);
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(1632, 219); this.labOrderNo.Location = new System.Drawing.Point(1628, 219);
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(704, 152); this.labOrderNo.Size = new System.Drawing.Size(708, 152);
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(1378, 219); this.label4.Location = new System.Drawing.Point(1374, 219);
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(249, 152); this.label4.Size = new System.Drawing.Size(249, 152);
@ -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(395, 219); this.labStationNo.Location = new System.Drawing.Point(394, 219);
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(978, 152); this.labStationNo.Size = new System.Drawing.Size(975, 152);
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, 219); this.label2.Location = new System.Drawing.Point(3, 219);
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(387, 152); this.label2.Size = new System.Drawing.Size(386, 152);
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(1632, 376); this.labPName.Location = new System.Drawing.Point(1628, 376);
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(704, 249); this.labPName.Size = new System.Drawing.Size(708, 249);
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(1378, 376); this.label8.Location = new System.Drawing.Point(1374, 376);
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(249, 249); this.label8.Size = new System.Drawing.Size(249, 249);
@ -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(395, 376); this.labPartNo.Location = new System.Drawing.Point(394, 376);
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(978, 249); this.labPartNo.Size = new System.Drawing.Size(975, 249);
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, 376); this.label6.Location = new System.Drawing.Point(3, 376);
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(387, 249); this.label6.Size = new System.Drawing.Size(386, 249);
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(1632, 630); this.labBadCount.Location = new System.Drawing.Point(1628, 630);
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(704, 449); this.labBadCount.Size = new System.Drawing.Size(708, 449);
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(395, 630); this.labNum.Location = new System.Drawing.Point(394, 630);
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(978, 449); this.labNum.Size = new System.Drawing.Size(975, 449);
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, 630); this.label10.Location = new System.Drawing.Point(3, 630);
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(387, 449); this.label10.Size = new System.Drawing.Size(386, 449);
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(383, 105); this.label14.Size = new System.Drawing.Size(382, 105);
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(397, 5); this.textBox1.Location = new System.Drawing.Point(396, 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(974, 77); this.textBox1.Size = new System.Drawing.Size(971, 77);
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(1634, 1); this.labErrMessage.Location = new System.Drawing.Point(1630, 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(700, 215); this.labErrMessage.Size = new System.Drawing.Size(704, 215);
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, 253F)); 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, 707F)); this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 711F));
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, 37F));
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(1378, 630); this.label12.Location = new System.Drawing.Point(1374, 630);
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(249, 449); this.label12.Size = new System.Drawing.Size(249, 449);
@ -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(1794, 0); this.labTime.Location = new System.Drawing.Point(1792, 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(553, 130); this.labTime.Size = new System.Drawing.Size(555, 130);
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);
@ -508,7 +508,7 @@
this.pictureBox1.Location = new System.Drawing.Point(0, 0); this.pictureBox1.Location = new System.Drawing.Point(0, 0);
this.pictureBox1.Margin = new System.Windows.Forms.Padding(0); this.pictureBox1.Margin = new System.Windows.Forms.Padding(0);
this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(325, 130); this.pictureBox1.Size = new System.Drawing.Size(324, 130);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox1.TabIndex = 0; this.pictureBox1.TabIndex = 0;
this.pictureBox1.TabStop = false; this.pictureBox1.TabStop = false;
@ -518,10 +518,10 @@
this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.BackColor = System.Drawing.Color.Transparent;
this.label1.Dock = System.Windows.Forms.DockStyle.Fill; 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.Font = new System.Drawing.Font("黑体", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.Location = new System.Drawing.Point(325, 0); this.label1.Location = new System.Drawing.Point(324, 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(1469, 130); this.label1.Size = new System.Drawing.Size(1468, 130);
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, 552F)); this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 554F));
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);

3
InjectionPC/FrmLogin.cs
View File

@ -92,7 +92,8 @@ namespace InjectionPC
{ {
this.Visible = false; this.Visible = false;
//Form fr = new FrmMain(); //Form fr = new FrmMain();
Form fr = new FrmMain2408(); //Form fr = new FrmMain2408();
Form fr = new FrmMain2411();
fr.Show(); fr.Show();
//if (ConfigurationManager.AppSettings["Mode"] == "0") //if (ConfigurationManager.AppSettings["Mode"] == "0")
//{ //{

9
InjectionPC/FrmMain.Designer.cs
View File

@ -28,7 +28,6 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
this.components = new System.ComponentModel.Container();
GlacialComponents.Controls.GLColumn glColumn1 = new GlacialComponents.Controls.GLColumn(); GlacialComponents.Controls.GLColumn glColumn1 = new GlacialComponents.Controls.GLColumn();
GlacialComponents.Controls.GLColumn glColumn2 = new GlacialComponents.Controls.GLColumn(); GlacialComponents.Controls.GLColumn glColumn2 = new GlacialComponents.Controls.GLColumn();
GlacialComponents.Controls.GLColumn glColumn3 = new GlacialComponents.Controls.GLColumn(); GlacialComponents.Controls.GLColumn glColumn3 = new GlacialComponents.Controls.GLColumn();
@ -118,10 +117,10 @@
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
this.panel3 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel();
this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.timer1 = new System.Windows.Forms.Timer(this.components); this.timer1 = new System.Windows.Forms.Timer();
this.serialPort1 = new System.IO.Ports.SerialPort(this.components); this.serialPort1 = new System.IO.Ports.SerialPort();
this.timer2 = new System.Windows.Forms.Timer(this.components); this.timer2 = new System.Windows.Forms.Timer();
this.timer3 = new System.Windows.Forms.Timer(this.components); this.timer3 = new System.Windows.Forms.Timer();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
this.panel7.SuspendLayout(); this.panel7.SuspendLayout();
this.panel23.SuspendLayout(); this.panel23.SuspendLayout();

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();
@ -733,43 +733,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);
@ -1576,7 +1576,7 @@
// //
this.btnOnlyBarCode.BackColor = System.Drawing.Color.DeepSkyBlue; this.btnOnlyBarCode.BackColor = System.Drawing.Color.DeepSkyBlue;
this.btnOnlyBarCode.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOnlyBarCode.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOnlyBarCode.Location = new System.Drawing.Point(1467, 0); this.btnOnlyBarCode.Location = new System.Drawing.Point(3, 1);
this.btnOnlyBarCode.Name = "btnOnlyBarCode"; this.btnOnlyBarCode.Name = "btnOnlyBarCode";
this.btnOnlyBarCode.Size = new System.Drawing.Size(217, 143); this.btnOnlyBarCode.Size = new System.Drawing.Size(217, 143);
this.btnOnlyBarCode.TabIndex = 1; this.btnOnlyBarCode.TabIndex = 1;

26
InjectionPC/FrmMain2408.cs
View File

@ -2154,7 +2154,13 @@ namespace InjectionPC
try try
{ {
glacialList1.Items.Clear(); glacialList1.Items.Clear();
DataTable dt = bll.SearchInfo(Program.station); DataTable dt1 = bll.SearchInfo(Program.station);
DataTable dt = dt1.Clone();
List<DataRow> list = dt1.AsEnumerable().Where(p => string.IsNullOrEmpty(p.Field<string>("BoxNo")) == false).ToList();
if (list.Count > 0)
{
dt = list.CopyToDataTable();
}
if (dt != null && dt.Rows.Count > 0) if (dt != null && dt.Rows.Count > 0)
{ {
for (int i = 0; i < dt.Rows.Count; i++) for (int i = 0; i < dt.Rows.Count; i++)
@ -3128,9 +3134,21 @@ namespace InjectionPC
GlacialComponents.Controls.GLItem gv; GlacialComponents.Controls.GLItem gv;
gv = glacialList1.SelectedItems[0] as GlacialComponents.Controls.GLItem; gv = glacialList1.SelectedItems[0] as GlacialComponents.Controls.GLItem;
md.BarCode = gv.Text; md.BarCode = gv.Text;
string boxCode = (glacialList1.SelectedItems[0] as GlacialComponents.Controls.GLItem).SubItems[0].Tag?.ToString();
bll.DelBarCode_New(md, Program.tableName); if(boxCode == lbPackageCodeL.Text?.Trim() || boxCode == lbPackageCodeR.Text?.Trim())
initBarCode(); {
string msg = bll.DelBarCode(gv.Text?.Trim(), Program.tableName);
if (!string.IsNullOrEmpty(msg))
{
MessageBox.Show(msg);
}
initBarCode();
}
else
{
MessageBox.Show($" 删除条码的箱码[{boxCode}]不属于当前装箱范围内,无法删除.!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
return;
}
} }
} }
} }

82
InjectionPC/FrmMain2411.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(FrmMain2411)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMain2411));
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();
@ -683,43 +683,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);
@ -1198,7 +1198,7 @@
// //
this.btnBarCodeWithBox.BackColor = System.Drawing.Color.DeepSkyBlue; this.btnBarCodeWithBox.BackColor = System.Drawing.Color.DeepSkyBlue;
this.btnBarCodeWithBox.Font = new System.Drawing.Font("宋体", 14.14286F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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(1464, 1); this.btnBarCodeWithBox.Location = new System.Drawing.Point(0, 1);
this.btnBarCodeWithBox.Name = "btnBarCodeWithBox"; this.btnBarCodeWithBox.Name = "btnBarCodeWithBox";
this.btnBarCodeWithBox.Size = new System.Drawing.Size(217, 143); this.btnBarCodeWithBox.Size = new System.Drawing.Size(217, 143);
this.btnBarCodeWithBox.TabIndex = 2; this.btnBarCodeWithBox.TabIndex = 2;

20
InjectionPC/FrmMain2411.cs
View File

@ -2099,7 +2099,15 @@ namespace InjectionPC
try try
{ {
glacialList1.Items.Clear(); glacialList1.Items.Clear();
DataTable dt = bll.SearchInfo(Program.station); DataTable dt1 = bll.SearchInfo(Program.station);
DataTable dt = dt1.Clone();
List<DataRow> list = dt1.AsEnumerable().Where(p => string.IsNullOrEmpty(p.Field<string>("BoxNo")) == true).ToList();
if (list.Count > 0)
{
dt = list.CopyToDataTable();
}
if (dt != null && dt.Rows.Count > 0) if (dt != null && dt.Rows.Count > 0)
{ {
for (int i = 0; i < dt.Rows.Count; i++) for (int i = 0; i < dt.Rows.Count; i++)
@ -3073,14 +3081,22 @@ namespace InjectionPC
gv = glacialList1.SelectedItems[0] as GlacialComponents.Controls.GLItem; gv = glacialList1.SelectedItems[0] as GlacialComponents.Controls.GLItem;
md.BarCode = gv.Text; md.BarCode = gv.Text;
bll.DelBarCode_New(md, Program.tableName); string msg = bll.DelBarCode(gv.Text?.Trim(), Program.tableName);
if (!string.IsNullOrEmpty(msg))
{
MessageBox.Show(msg);
}
initBarCode(); initBarCode();
//bll.DelBarCode_New(md, Program.tableName);
//initBarCode();
} }
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod()); LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
MessageBox.Show(ex.Message);
} }
} }

42
InjectionPC/FrmQuality.cs
View File

@ -346,10 +346,14 @@ namespace InjectionPC
MessageBox.Show("箱单和条码只能输入一个!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information); MessageBox.Show("箱单和条码只能输入一个!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
return; return;
} }
if (txtBoxCode.Text == "" && txtScanBarCode.Text == "")
{
MessageBox.Show("请扫描条码", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
return;
}
#region 大件报废
#region 大件报废 if (txtBoxCode.Text == "" && txtScanBarCode.Text != "")
if (txtBoxCode.Text == "" && txtScanBarCode.Text != "")
{ {
SingleBadSave(); SingleBadSave();
} }
@ -569,6 +573,26 @@ namespace InjectionPC
} }
} }
else
{
bool exsitInWms = _wmsBll.IsReadBarCodeInWms(badmd.BarCode);
if (exsitInWms == true)
{
MessageBox.Show($"条码[{badmd.BarCode}]在WMS已处理,无法在MES进行报废操作.");
return false;
}
string msg = badBLL.SaveBad(badmd, boxCode, Program.tableName);
if (!string.IsNullOrEmpty(msg))
{
MessageBox.Show("报废操作失败,失败原因:" + msg);
return false;
}
else
{
MessageBox.Show(badmd.OneBarCode + "报废操作成功");
}
}
return true; return true;
} }
@ -594,7 +618,11 @@ namespace InjectionPC
/// </summary> /// </summary>
private void FullBoxBadSave(DataTable boxDetailTable) private void FullBoxBadSave(DataTable boxDetailTable)
{ {
if(boxDetailTable == null || boxDetailTable.Rows.Count ==0)
{
MessageBox.Show($"箱码[{txtBoxCode.Text}]所含详细记录为0,请重新操作.");
return;
}
if (MessageBox.Show($"确认对箱码[{txtBoxCode.Text}]所含[{boxDetailTable.Rows.Count}]条数据做报废处理?", "", MessageBoxButtons.OKCancel) == DialogResult.Cancel) if (MessageBox.Show($"确认对箱码[{txtBoxCode.Text}]所含[{boxDetailTable.Rows.Count}]条数据做报废处理?", "", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
return; return;
string boxCode = boxDetailTable.Rows[0]["BoxNo"].ToString(); string boxCode = boxDetailTable.Rows[0]["BoxNo"].ToString();
@ -970,6 +998,7 @@ namespace InjectionPC
if(packageTable.Rows.Count == 0) if(packageTable.Rows.Count == 0)
{ {
//MessageBox.Show($"扫描箱单[{packageCode}]在系统中不存在!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information); //MessageBox.Show($"扫描箱单[{packageCode}]在系统中不存在!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
MessageBox.Show($"扫描箱单[{packageCode}]不存在未报废订单!");
txtBoxCode.Focus(); txtBoxCode.Focus();
return; return;
} }
@ -1106,7 +1135,10 @@ namespace InjectionPC
{ {
txtBoxCode.Enabled = true; txtBoxCode.Enabled = true;
txtScanBarCode.Text = ""; txtScanBarCode.Text = "";
textBox2.Text = "";
textBox4.Text = "";
txtBoxCode.Focus(); txtBoxCode.Focus();
} }
else else
{ {
@ -1120,6 +1152,8 @@ namespace InjectionPC
{ {
txtScanBarCode.Enabled = true; txtScanBarCode.Enabled = true;
txtBoxCode.Text = ""; txtBoxCode.Text = "";
textBox2.Text = "";
textBox4.Text = "";
txtScanBarCode.Focus(); txtScanBarCode.Focus();
} }
else else

9
MESClassLibrary/BLL/BasicInfo/BadInjectionBLL.cs
View File

@ -251,8 +251,14 @@ namespace MESClassLibrary.BLL.BasicInfo
{ {
localDB.BeginTrans(); localDB.BeginTrans();
db.AddInfo(localDB, md); db.AddInfo(localDB, md);
_injectionBoxBLL.UpdateBoxCount(localDB, boxCode, -1); if (!string.IsNullOrEmpty(boxCode))
{
_injectionBoxBLL.UpdateBoxCount(localDB, boxCode, -1);
}
barCodeBll.UpdateIsBad(localDB, tableName, md.OneBarCode, md.BarCode); barCodeBll.UpdateIsBad(localDB, tableName, md.OneBarCode, md.BarCode);
BarCodeModel bcm = new BarCodeModel(); BarCodeModel bcm = new BarCodeModel();
bcm.IsBad = 1; bcm.IsBad = 1;
bcm.OneBarCode = md.OneBarCode; bcm.OneBarCode = md.OneBarCode;
@ -261,6 +267,7 @@ namespace MESClassLibrary.BLL.BasicInfo
bcm.Des1 = md.Desc; bcm.Des1 = md.Desc;
bcm.PartNo = md.code; bcm.PartNo = md.code;
bcm.StationID = md.StationID; bcm.StationID = md.StationID;
_wmsBll.DeleteInterface(localDB, md.OneBarCode);
_wmsBll.SaveInterface(localDB, bcm, md.BadReason); _wmsBll.SaveInterface(localDB, bcm, md.BadReason);
localDB.Commit(); localDB.Commit();
return ""; return "";

41
MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs
View File

@ -281,6 +281,47 @@ namespace MESClassLibrary.BLL.BasicInfo
return false; return false;
} }
} }
/// <summary>
/// 条码删除 --wms中间表未读数据,删除中间表,tb_barcode中IsDel=1
/// </summary>
/// <param name="barCode"></param>
/// <param name="tableName"></param>
/// <returns></returns>
public string DelBarCode(string barCode, string tableName)
{
LocalDBService localDB = new LocalDBService(SqlHelper.GetConnSting());
try
{
localDB.BeginTrans();
bool wms = wmsDal.DeleteInterface(localDB, barCode);
if (wms == false)
{
throw new Exception($"条码在wms库已报工,无法删除!");
}
db.DelBarCode(localDB, barCode, tableName);
localDB.Commit();
return "";
}
catch (Exception ex)
{
if (localDB != null)
{
localDB.Rollback();
}
LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
return ex.Message;
}
finally
{
if (localDB != null)
{
localDB.EndTrans();
}
}
}
public DataTable SearchBoxIsNull(string partNo, string StationID, string tableName, string ProductNature) public DataTable SearchBoxIsNull(string partNo, string StationID, string tableName, string ProductNature)
{ {

5
MESClassLibrary/BLL/Wms/WmsBLL.cs
View File

@ -52,6 +52,11 @@ namespace MESClassLibrary.BLL.Injection
{ {
da.SaveInterface(local, bcm, badReason); da.SaveInterface(local, bcm, badReason);
} }
public void DeleteInterface(LocalDBService local, string oneBarCode)
{
da.DeleteInterface(local, oneBarCode);
}
/// <summary> /// <summary>
/// 合格保存接口 /// 合格保存接口
/// </summary> /// </summary>

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

@ -366,16 +366,14 @@ namespace MESClassLibrary.DAL.BasicInfo
} }
public bool AddInfoNew(LocalDBService local, BarCodeModel md, string tableName) public bool AddInfoNew(LocalDBService local, BarCodeModel md, string tableName)
{ {
#region 添加数据
string sql = ""; string sql = "";
SqlParameter[] param = null;
sql = "INSERT INTO " + tableName + " (ID,StationID,OneBarCode,[BarCode],[StockNo],[PartNo],[PrintType],[CreateTime],[IsImport],StationID2,PlanID,ProductNature,Des1,Des2,Des3,Des4,Des5,BoxNo,Weight"; sql = "INSERT INTO " + tableName + " (ID,StationID,OneBarCode,[BarCode],[StockNo],[PartNo],[PrintType],[CreateTime],[IsImport],StationID2,PlanID,ProductNature,Des1,Des2,Des3,Des4,Des5,BoxNo,Weight";
sql += $") VALUES ('{md.ID}','{md.StationID}','{md.OneBarCode}','{md.BarCode}','{md.StockNo}','{md.PartNo}','{md.PrintType}',getdate(),'{md.Import}'," + sql += $") VALUES ('{md.ID}','{md.StationID}','{md.OneBarCode}','{md.BarCode}','{md.StockNo}','{md.PartNo}','{md.PrintType}',getdate(),'{md.Import}'," +
$"'{md.StationID2}','{md.PlanID}','{md.ProductNature}','{md.Des1}','{md.Des2}','{md.Des3}','{md.Des4}','{md.Des5}','{md.BoxNo}','{ md.Weight}')"; $"'{md.StationID2}','{md.PlanID}','{md.ProductNature}','{md.Des1}','{md.Des2}','{md.Des3}','{md.Des4}','{md.Des5}','{md.BoxNo}','{ md.Weight}')";
#endregion
return local.Exec_NonQuery(sql); return local.Exec_NonQuery(sql);
@ -800,6 +798,19 @@ namespace MESClassLibrary.DAL.BasicInfo
} }
} }
public bool DelBarCode(LocalDBService localDB, string barCode, string tableName)
{
string column1 = "OneBarCode";
if (barCode.Contains("."))
{
column1 = "BarCode";
}
string sql = "update " + tableName + $" set IsDel=1 where {column1}='{barCode}'";
return localDB.Exec_NonQuery(sql);
}
public DateTime GetDateTime() public DateTime GetDateTime()
{ {
string sql = ""; string sql = "";

26
MESClassLibrary/DAL/Wms/WmsDAL.cs
View File

@ -62,6 +62,32 @@ namespace MESClassLibrary.DAL.Injection
return local.Exec_NonQuery(sql); return local.Exec_NonQuery(sql);
} }
public bool DeleteInterface(LocalDBService local, string oneBarCode)
{
try
{
string column1 = "OneBarCode";
if (oneBarCode.Contains("."))
{
column1 = "BarCode";
}
string sql2 = $"select * from tb_Injectionn_Interface where {column1}='{oneBarCode}' and WmsRead = 1";
DataTable dt = local.Exec_DataSet(sql2).Tables[0];
if(dt.Rows.Count > 0)
{
return false;
}
string sql = $"delete from tb_Injectionn_Interface where {column1}='{oneBarCode}'";
local.Exec_NonQuery(sql);
return true;
}
catch (Exception ex)
{
LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
return false;
}
}
/// <summary> /// <summary>
/// wms注塑中间表tb_Injectionn_Interface 单条插入箱码,注塑码数据 /// wms注塑中间表tb_Injectionn_Interface 单条插入箱码,注塑码数据
/// </summary> /// </summary>

Write Preview
Loading…
Cancel
Save