diff --git a/InjectionPC/FrmLogin.Designer.cs b/InjectionPC/FrmLogin.Designer.cs
index ab5868a..7d32a84 100644
--- a/InjectionPC/FrmLogin.Designer.cs
+++ b/InjectionPC/FrmLogin.Designer.cs
@@ -43,9 +43,10 @@
//
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label1.Location = new System.Drawing.Point(216, 194);
+ this.label1.Location = new System.Drawing.Point(432, 388);
+ this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(66, 19);
+ this.label1.Size = new System.Drawing.Size(131, 38);
this.label1.TabIndex = 0;
this.label1.Text = "用户名";
//
@@ -54,28 +55,31 @@
this.label2.AutoSize = true;
this.label2.BackColor = System.Drawing.Color.Transparent;
this.label2.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label2.Location = new System.Drawing.Point(216, 247);
+ this.label2.Location = new System.Drawing.Point(432, 494);
+ this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(47, 19);
+ this.label2.Size = new System.Drawing.Size(93, 38);
this.label2.TabIndex = 1;
this.label2.Text = "密码";
//
// textBox1
//
this.textBox1.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox1.Location = new System.Drawing.Point(296, 185);
+ this.textBox1.Location = new System.Drawing.Point(592, 370);
+ this.textBox1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(159, 29);
+ this.textBox1.Size = new System.Drawing.Size(314, 51);
this.textBox1.TabIndex = 2;
this.textBox1.Click += new System.EventHandler(this.textBox1_Click);
//
// textBox2
//
this.textBox2.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox2.Location = new System.Drawing.Point(296, 247);
+ this.textBox2.Location = new System.Drawing.Point(592, 494);
+ this.textBox2.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.textBox2.Name = "textBox2";
this.textBox2.PasswordChar = '*';
- this.textBox2.Size = new System.Drawing.Size(159, 29);
+ this.textBox2.Size = new System.Drawing.Size(314, 51);
this.textBox2.TabIndex = 3;
this.textBox2.Click += new System.EventHandler(this.textBox2_Click);
//
@@ -83,11 +87,12 @@
//
this.button1.BackColor = System.Drawing.Color.LightSkyBlue;
this.button1.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button1.Location = new System.Drawing.Point(231, 306);
+ this.button1.Location = new System.Drawing.Point(462, 612);
+ this.button1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(84, 38);
+ this.button1.Size = new System.Drawing.Size(168, 76);
this.button1.TabIndex = 4;
- this.button1.Text = "登陆";
+ this.button1.Text = "登录";
this.button1.UseVisualStyleBackColor = false;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
@@ -95,9 +100,10 @@
//
this.button2.BackColor = System.Drawing.Color.LightSkyBlue;
this.button2.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button2.Location = new System.Drawing.Point(387, 306);
+ this.button2.Location = new System.Drawing.Point(774, 612);
+ this.button2.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(83, 38);
+ this.button2.Size = new System.Drawing.Size(166, 76);
this.button2.TabIndex = 5;
this.button2.Text = "取消";
this.button2.UseVisualStyleBackColor = false;
@@ -108,17 +114,18 @@
this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
this.pictureBox1.Location = new System.Drawing.Point(0, 0);
+ this.pictureBox1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(703, 453);
+ this.pictureBox1.Size = new System.Drawing.Size(1406, 906);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox1.TabIndex = 6;
this.pictureBox1.TabStop = false;
//
// FrmLogin
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(703, 453);
+ this.ClientSize = new System.Drawing.Size(1406, 906);
this.Controls.Add(this.label2);
this.Controls.Add(this.textBox1);
this.Controls.Add(this.textBox2);
@@ -126,6 +133,7 @@
this.Controls.Add(this.button2);
this.Controls.Add(this.label1);
this.Controls.Add(this.pictureBox1);
+ this.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.Name = "FrmLogin";
this.Text = "登录";
this.Load += new System.EventHandler(this.FrmLogin_Load);
diff --git a/InjectionPC/FrmLogin.cs b/InjectionPC/FrmLogin.cs
index 31f9404..0c8aaa1 100644
--- a/InjectionPC/FrmLogin.cs
+++ b/InjectionPC/FrmLogin.cs
@@ -91,7 +91,7 @@ namespace InjectionPC
if (dt != null && dt.Rows.Count > 0)
{
this.Visible = false;
- // Form fr = new FrmMain();
+ //Form fr = new FrmMain();
Form fr = new FrmMain2408();
fr.Show();
//if (ConfigurationManager.AppSettings["Mode"] == "0")
diff --git a/InjectionPC/FrmMain.Designer.cs b/InjectionPC/FrmMain.Designer.cs
index ef9ceb9..6f343bb 100644
--- a/InjectionPC/FrmMain.Designer.cs
+++ b/InjectionPC/FrmMain.Designer.cs
@@ -176,9 +176,9 @@
this.panel1.Controls.Add(this.panel2);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0);
- this.panel1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(2347, 1539);
+ this.panel1.Size = new System.Drawing.Size(2560, 1759);
this.panel1.TabIndex = 0;
//
// panel7
@@ -187,10 +187,10 @@
this.panel7.Controls.Add(this.panel8);
this.panel7.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel7.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
- this.panel7.Location = new System.Drawing.Point(0, 147);
- this.panel7.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel7.Location = new System.Drawing.Point(0, 168);
+ this.panel7.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel7.Name = "panel7";
- this.panel7.Size = new System.Drawing.Size(2347, 1392);
+ this.panel7.Size = new System.Drawing.Size(2560, 1591);
this.panel7.TabIndex = 1;
//
// panel23
@@ -198,10 +198,10 @@
this.panel23.Controls.Add(this.panel27);
this.panel23.Controls.Add(this.panel24);
this.panel23.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel23.Location = new System.Drawing.Point(0, 91);
- this.panel23.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel23.Location = new System.Drawing.Point(0, 104);
+ this.panel23.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel23.Name = "panel23";
- this.panel23.Size = new System.Drawing.Size(2347, 1301);
+ this.panel23.Size = new System.Drawing.Size(2560, 1487);
this.panel23.TabIndex = 1;
//
// panel27
@@ -209,10 +209,10 @@
this.panel27.Controls.Add(this.panel29);
this.panel27.Controls.Add(this.panel28);
this.panel27.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel27.Location = new System.Drawing.Point(0, 975);
- this.panel27.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel27.Location = new System.Drawing.Point(0, 1114);
+ this.panel27.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel27.Name = "panel27";
- this.panel27.Size = new System.Drawing.Size(2347, 326);
+ this.panel27.Size = new System.Drawing.Size(2560, 373);
this.panel27.TabIndex = 1;
//
// panel29
@@ -220,10 +220,10 @@
this.panel29.Controls.Add(this.panel31);
this.panel29.Controls.Add(this.panel30);
this.panel29.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel29.Location = new System.Drawing.Point(310, 0);
- this.panel29.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel29.Location = new System.Drawing.Point(338, 0);
+ this.panel29.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel29.Name = "panel29";
- this.panel29.Size = new System.Drawing.Size(2037, 326);
+ this.panel29.Size = new System.Drawing.Size(2222, 373);
this.panel29.TabIndex = 1;
//
// panel31
@@ -231,10 +231,10 @@
this.panel31.Controls.Add(this.panel33);
this.panel31.Controls.Add(this.panel32);
this.panel31.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel31.Location = new System.Drawing.Point(123, 0);
- this.panel31.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel31.Location = new System.Drawing.Point(134, 0);
+ this.panel31.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel31.Name = "panel31";
- this.panel31.Size = new System.Drawing.Size(1914, 326);
+ this.panel31.Size = new System.Drawing.Size(2088, 373);
this.panel31.TabIndex = 1;
//
// panel33
@@ -242,10 +242,10 @@
this.panel33.Controls.Add(this.panel35);
this.panel33.Controls.Add(this.panel34);
this.panel33.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel33.Location = new System.Drawing.Point(123, 0);
- this.panel33.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel33.Location = new System.Drawing.Point(134, 0);
+ this.panel33.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel33.Name = "panel33";
- this.panel33.Size = new System.Drawing.Size(1791, 326);
+ this.panel33.Size = new System.Drawing.Size(1954, 373);
this.panel33.TabIndex = 1;
//
// panel35
@@ -253,9 +253,9 @@
this.panel35.Controls.Add(this.panel37);
this.panel35.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel35.Location = new System.Drawing.Point(0, 0);
- this.panel35.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel35.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel35.Name = "panel35";
- this.panel35.Size = new System.Drawing.Size(1668, 326);
+ this.panel35.Size = new System.Drawing.Size(1820, 373);
this.panel35.TabIndex = 1;
//
// panel37
@@ -263,9 +263,9 @@
this.panel37.Controls.Add(this.panel40);
this.panel37.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel37.Location = new System.Drawing.Point(0, 0);
- this.panel37.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel37.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel37.Name = "panel37";
- this.panel37.Size = new System.Drawing.Size(1668, 326);
+ this.panel37.Size = new System.Drawing.Size(1820, 373);
this.panel37.TabIndex = 1;
//
// panel40
@@ -274,9 +274,9 @@
this.panel40.Controls.Add(this.panel41);
this.panel40.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel40.Location = new System.Drawing.Point(0, 0);
- this.panel40.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel40.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel40.Name = "panel40";
- this.panel40.Size = new System.Drawing.Size(1668, 326);
+ this.panel40.Size = new System.Drawing.Size(1820, 373);
this.panel40.TabIndex = 1;
//
// panel42
@@ -285,9 +285,9 @@
this.panel42.Controls.Add(this.panel43);
this.panel42.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel42.Location = new System.Drawing.Point(0, 0);
- this.panel42.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel42.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel42.Name = "panel42";
- this.panel42.Size = new System.Drawing.Size(1545, 326);
+ this.panel42.Size = new System.Drawing.Size(1686, 373);
this.panel42.TabIndex = 1;
//
// panel39
@@ -303,28 +303,28 @@
this.panel39.Controls.Add(this.label21);
this.panel39.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel39.Location = new System.Drawing.Point(0, 0);
- this.panel39.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel39.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel39.Name = "panel39";
- this.panel39.Size = new System.Drawing.Size(1422, 326);
+ this.panel39.Size = new System.Drawing.Size(1552, 373);
this.panel39.TabIndex = 1;
//
// textBox2
//
this.textBox2.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox2.Location = new System.Drawing.Point(220, 292);
- this.textBox2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.textBox2.Location = new System.Drawing.Point(240, 334);
+ this.textBox2.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(303, 65);
+ this.textBox2.Size = new System.Drawing.Size(330, 74);
this.textBox2.TabIndex = 13;
//
// label18
//
this.label18.AutoSize = true;
this.label18.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label18.Location = new System.Drawing.Point(40, 303);
- this.label18.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label18.Location = new System.Drawing.Point(44, 346);
+ this.label18.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label18.Name = "label18";
- this.label18.Size = new System.Drawing.Size(178, 51);
+ this.label18.Size = new System.Drawing.Size(202, 58);
this.label18.TabIndex = 12;
this.label18.Text = "数量：";
//
@@ -332,10 +332,10 @@
//
this.label19.AutoSize = true;
this.label19.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label19.Location = new System.Drawing.Point(607, 177);
- this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label19.Location = new System.Drawing.Point(662, 202);
+ this.label19.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label19.Name = "label19";
- this.label19.Size = new System.Drawing.Size(238, 51);
+ this.label19.Size = new System.Drawing.Size(265, 58);
this.label19.TabIndex = 11;
this.label19.Text = "(yyMMdd)";
//
@@ -343,20 +343,20 @@
//
this.textBox1.Enabled = false;
this.textBox1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox1.Location = new System.Drawing.Point(222, 172);
- this.textBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.textBox1.Location = new System.Drawing.Point(242, 197);
+ this.textBox1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(301, 65);
+ this.textBox1.Size = new System.Drawing.Size(328, 74);
this.textBox1.TabIndex = 10;
//
// label20
//
this.label20.AutoSize = true;
this.label20.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label20.Location = new System.Drawing.Point(42, 186);
- this.label20.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label20.Location = new System.Drawing.Point(46, 213);
+ this.label20.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label20.Name = "label20";
- this.label20.Size = new System.Drawing.Size(178, 51);
+ this.label20.Size = new System.Drawing.Size(202, 58);
this.label20.TabIndex = 9;
this.label20.Text = "批次：";
//
@@ -365,10 +365,10 @@
this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBox2.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.comboBox2.FormattingEnabled = true;
- this.comboBox2.Location = new System.Drawing.Point(222, 63);
- this.comboBox2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.comboBox2.Location = new System.Drawing.Point(242, 72);
+ this.comboBox2.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.comboBox2.Name = "comboBox2";
- this.comboBox2.Size = new System.Drawing.Size(851, 50);
+ this.comboBox2.Size = new System.Drawing.Size(928, 56);
this.comboBox2.TabIndex = 8;
this.comboBox2.TextChanged += new System.EventHandler(this.comboBox2_TextChanged);
//
@@ -376,10 +376,10 @@
//
this.label21.AutoSize = true;
this.label21.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label21.Location = new System.Drawing.Point(42, 70);
- this.label21.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label21.Location = new System.Drawing.Point(46, 80);
+ this.label21.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label21.Name = "label21";
- this.label21.Size = new System.Drawing.Size(178, 51);
+ this.label21.Size = new System.Drawing.Size(202, 58);
this.label21.TabIndex = 7;
this.label21.Text = "产品：";
//
@@ -387,10 +387,10 @@
//
this.panel43.Controls.Add(this.label23);
this.panel43.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel43.Location = new System.Drawing.Point(1422, 0);
- this.panel43.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel43.Location = new System.Drawing.Point(1552, 0);
+ this.panel43.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel43.Name = "panel43";
- this.panel43.Size = new System.Drawing.Size(123, 326);
+ this.panel43.Size = new System.Drawing.Size(134, 373);
this.panel43.TabIndex = 0;
//
// label23
@@ -399,9 +399,9 @@
this.label23.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label23.Dock = System.Windows.Forms.DockStyle.Fill;
this.label23.Location = new System.Drawing.Point(0, 0);
- this.label23.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label23.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(123, 326);
+ this.label23.Size = new System.Drawing.Size(134, 373);
this.label23.TabIndex = 0;
this.label23.Text = "手工打印条码";
this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -411,10 +411,10 @@
//
this.panel41.Controls.Add(this.label22);
this.panel41.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel41.Location = new System.Drawing.Point(1545, 0);
- this.panel41.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel41.Location = new System.Drawing.Point(1686, 0);
+ this.panel41.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel41.Name = "panel41";
- this.panel41.Size = new System.Drawing.Size(123, 326);
+ this.panel41.Size = new System.Drawing.Size(134, 373);
this.panel41.TabIndex = 0;
//
// label22
@@ -423,9 +423,9 @@
this.label22.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label22.Dock = System.Windows.Forms.DockStyle.Fill;
this.label22.Location = new System.Drawing.Point(0, 0);
- this.label22.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label22.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label22.Name = "label22";
- this.label22.Size = new System.Drawing.Size(123, 326);
+ this.label22.Size = new System.Drawing.Size(134, 373);
this.label22.TabIndex = 0;
this.label22.Text = "补打条码";
this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -435,10 +435,10 @@
//
this.panel34.Controls.Add(this.label15);
this.panel34.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel34.Location = new System.Drawing.Point(1668, 0);
- this.panel34.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel34.Location = new System.Drawing.Point(1820, 0);
+ this.panel34.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel34.Name = "panel34";
- this.panel34.Size = new System.Drawing.Size(123, 326);
+ this.panel34.Size = new System.Drawing.Size(134, 373);
this.panel34.TabIndex = 0;
//
// label15
@@ -447,9 +447,9 @@
this.label15.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label15.Dock = System.Windows.Forms.DockStyle.Fill;
this.label15.Location = new System.Drawing.Point(0, 0);
- this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label15.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(123, 326);
+ this.label15.Size = new System.Drawing.Size(134, 373);
this.label15.TabIndex = 0;
this.label15.Text = "删除条码";
this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -460,9 +460,9 @@
this.panel32.Controls.Add(this.label14);
this.panel32.Dock = System.Windows.Forms.DockStyle.Left;
this.panel32.Location = new System.Drawing.Point(0, 0);
- this.panel32.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel32.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel32.Name = "panel32";
- this.panel32.Size = new System.Drawing.Size(123, 326);
+ this.panel32.Size = new System.Drawing.Size(134, 373);
this.panel32.TabIndex = 0;
//
// label14
@@ -471,9 +471,9 @@
this.label14.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label14.Dock = System.Windows.Forms.DockStyle.Fill;
this.label14.Location = new System.Drawing.Point(0, 0);
- this.label14.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label14.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(123, 326);
+ this.label14.Size = new System.Drawing.Size(134, 373);
this.label14.TabIndex = 0;
this.label14.Text = "下一计划";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -484,9 +484,9 @@
this.panel30.Controls.Add(this.label13);
this.panel30.Dock = System.Windows.Forms.DockStyle.Left;
this.panel30.Location = new System.Drawing.Point(0, 0);
- this.panel30.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel30.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel30.Name = "panel30";
- this.panel30.Size = new System.Drawing.Size(123, 326);
+ this.panel30.Size = new System.Drawing.Size(134, 373);
this.panel30.TabIndex = 0;
//
// label13
@@ -495,9 +495,9 @@
this.label13.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label13.Dock = System.Windows.Forms.DockStyle.Fill;
this.label13.Location = new System.Drawing.Point(0, 0);
- this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label13.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(123, 326);
+ this.label13.Size = new System.Drawing.Size(134, 373);
this.label13.TabIndex = 0;
this.label13.Text = "暂停打印";
this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -508,9 +508,9 @@
this.panel28.Controls.Add(this.label12);
this.panel28.Dock = System.Windows.Forms.DockStyle.Left;
this.panel28.Location = new System.Drawing.Point(0, 0);
- this.panel28.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel28.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel28.Name = "panel28";
- this.panel28.Size = new System.Drawing.Size(310, 326);
+ this.panel28.Size = new System.Drawing.Size(338, 373);
this.panel28.TabIndex = 0;
//
// label12
@@ -520,9 +520,9 @@
this.label12.Dock = System.Windows.Forms.DockStyle.Fill;
this.label12.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label12.Location = new System.Drawing.Point(0, 0);
- this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label12.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(310, 326);
+ this.label12.Size = new System.Drawing.Size(338, 373);
this.label12.TabIndex = 0;
this.label12.Text = "打印信息：";
this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -533,9 +533,9 @@
this.panel24.Controls.Add(this.panel25);
this.panel24.Dock = System.Windows.Forms.DockStyle.Top;
this.panel24.Location = new System.Drawing.Point(0, 0);
- this.panel24.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel24.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel24.Name = "panel24";
- this.panel24.Size = new System.Drawing.Size(2347, 975);
+ this.panel24.Size = new System.Drawing.Size(2560, 1114);
this.panel24.TabIndex = 0;
//
// panel26
@@ -544,10 +544,10 @@
this.panel26.Controls.Add(this.panel44);
this.panel26.Controls.Add(this.glacialList1);
this.panel26.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel26.Location = new System.Drawing.Point(310, 0);
- this.panel26.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel26.Location = new System.Drawing.Point(338, 0);
+ this.panel26.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel26.Name = "panel26";
- this.panel26.Size = new System.Drawing.Size(2037, 975);
+ this.panel26.Size = new System.Drawing.Size(2222, 1114);
this.panel26.TabIndex = 1;
//
// panel45
@@ -557,19 +557,19 @@
this.panel45.Controls.Add(this.button4);
this.panel45.Controls.Add(this.textBox4);
this.panel45.Controls.Add(this.label25);
- this.panel45.Location = new System.Drawing.Point(295, 592);
- this.panel45.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel45.Location = new System.Drawing.Point(322, 677);
+ this.panel45.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel45.Name = "panel45";
- this.panel45.Size = new System.Drawing.Size(1280, 132);
+ this.panel45.Size = new System.Drawing.Size(1396, 151);
this.panel45.TabIndex = 2;
//
// button3
//
this.button3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button3.Location = new System.Drawing.Point(1129, 37);
- this.button3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.button3.Location = new System.Drawing.Point(1232, 42);
+ this.button3.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.button3.Name = "button3";
- this.button3.Size = new System.Drawing.Size(147, 52);
+ this.button3.Size = new System.Drawing.Size(160, 59);
this.button3.TabIndex = 5;
this.button3.Text = "取消";
this.button3.UseVisualStyleBackColor = true;
@@ -578,10 +578,10 @@
// button4
//
this.button4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button4.Location = new System.Drawing.Point(952, 38);
- this.button4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.button4.Location = new System.Drawing.Point(1039, 43);
+ this.button4.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.button4.Name = "button4";
- this.button4.Size = new System.Drawing.Size(147, 52);
+ this.button4.Size = new System.Drawing.Size(160, 59);
this.button4.TabIndex = 4;
this.button4.Text = "切换";
this.button4.UseVisualStyleBackColor = true;
@@ -590,20 +590,20 @@
// textBox4
//
this.textBox4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox4.Location = new System.Drawing.Point(308, 40);
- this.textBox4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.textBox4.Location = new System.Drawing.Point(336, 46);
+ this.textBox4.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.textBox4.Name = "textBox4";
- this.textBox4.Size = new System.Drawing.Size(605, 49);
+ this.textBox4.Size = new System.Drawing.Size(660, 55);
this.textBox4.TabIndex = 3;
//
// label25
//
this.label25.AutoSize = true;
this.label25.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label25.Location = new System.Drawing.Point(26, 46);
- this.label25.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label25.Location = new System.Drawing.Point(28, 53);
+ this.label25.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label25.Name = "label25";
- this.label25.Size = new System.Drawing.Size(283, 37);
+ this.label25.Size = new System.Drawing.Size(319, 42);
this.label25.TabIndex = 2;
this.label25.Text = "扫描模具条码：";
this.label25.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -615,19 +615,19 @@
this.panel44.Controls.Add(this.button1);
this.panel44.Controls.Add(this.textBox3);
this.panel44.Controls.Add(this.label24);
- this.panel44.Location = new System.Drawing.Point(330, 318);
- this.panel44.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel44.Location = new System.Drawing.Point(360, 363);
+ this.panel44.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel44.Name = "panel44";
- this.panel44.Size = new System.Drawing.Size(1280, 132);
+ this.panel44.Size = new System.Drawing.Size(1396, 151);
this.panel44.TabIndex = 1;
//
// button2
//
this.button2.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button2.Location = new System.Drawing.Point(1098, 38);
- this.button2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.button2.Location = new System.Drawing.Point(1198, 43);
+ this.button2.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(147, 52);
+ this.button2.Size = new System.Drawing.Size(160, 59);
this.button2.TabIndex = 3;
this.button2.Text = "取消";
this.button2.UseVisualStyleBackColor = true;
@@ -636,10 +636,10 @@
// button1
//
this.button1.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button1.Location = new System.Drawing.Point(941, 46);
- this.button1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.button1.Location = new System.Drawing.Point(1027, 53);
+ this.button1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(147, 52);
+ this.button1.Size = new System.Drawing.Size(160, 59);
this.button1.TabIndex = 2;
this.button1.Text = "确定";
this.button1.UseVisualStyleBackColor = true;
@@ -648,20 +648,20 @@
// textBox3
//
this.textBox3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox3.Location = new System.Drawing.Point(191, 38);
- this.textBox3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.textBox3.Location = new System.Drawing.Point(208, 43);
+ this.textBox3.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.textBox3.Name = "textBox3";
- this.textBox3.Size = new System.Drawing.Size(677, 49);
+ this.textBox3.Size = new System.Drawing.Size(738, 55);
this.textBox3.TabIndex = 1;
//
// label24
//
this.label24.AutoSize = true;
this.label24.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label24.Location = new System.Drawing.Point(24, 46);
- this.label24.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label24.Location = new System.Drawing.Point(26, 53);
+ this.label24.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label24.Name = "label24";
- this.label24.Size = new System.Drawing.Size(169, 37);
+ this.label24.Size = new System.Drawing.Size(190, 42);
this.label24.TabIndex = 0;
this.label24.Text = "箱单号：";
this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -729,17 +729,17 @@
this.glacialList1.HoverEvents = false;
this.glacialList1.HoverTime = 1;
this.glacialList1.ImageList = null;
- this.glacialList1.ItemHeight = 50;
+ this.glacialList1.ItemHeight = 57;
this.glacialList1.ItemWordWrap = false;
this.glacialList1.Location = new System.Drawing.Point(0, 0);
- this.glacialList1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.glacialList1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.glacialList1.Name = "glacialList1";
this.glacialList1.Selectable = true;
this.glacialList1.SelectedTextColor = System.Drawing.Color.White;
this.glacialList1.SelectionColor = System.Drawing.Color.DarkBlue;
this.glacialList1.ShowBorder = true;
this.glacialList1.ShowFocusRect = false;
- this.glacialList1.Size = new System.Drawing.Size(2037, 975);
+ this.glacialList1.Size = new System.Drawing.Size(2222, 1114);
this.glacialList1.SortType = GlacialComponents.Controls.SortTypes.InsertionSort;
this.glacialList1.SuperFlatHeaderColor = System.Drawing.Color.White;
this.glacialList1.TabIndex = 0;
@@ -752,9 +752,9 @@
this.panel25.Controls.Add(this.panel36);
this.panel25.Dock = System.Windows.Forms.DockStyle.Left;
this.panel25.Location = new System.Drawing.Point(0, 0);
- this.panel25.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel25.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel25.Name = "panel25";
- this.panel25.Size = new System.Drawing.Size(310, 975);
+ this.panel25.Size = new System.Drawing.Size(338, 1114);
this.panel25.TabIndex = 0;
//
// panel38
@@ -765,19 +765,19 @@
this.panel38.Controls.Add(this.label17);
this.panel38.Controls.Add(this.label16);
this.panel38.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel38.Location = new System.Drawing.Point(0, 406);
- this.panel38.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel38.Location = new System.Drawing.Point(0, 464);
+ this.panel38.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel38.Name = "panel38";
- this.panel38.Size = new System.Drawing.Size(310, 569);
+ this.panel38.Size = new System.Drawing.Size(338, 650);
this.panel38.TabIndex = 1;
//
// label27
//
this.label27.Font = new System.Drawing.Font("宋体", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label27.Location = new System.Drawing.Point(2, 401);
- this.label27.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label27.Location = new System.Drawing.Point(2, 458);
+ this.label27.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label27.Name = "label27";
- this.label27.Size = new System.Drawing.Size(306, 136);
+ this.label27.Size = new System.Drawing.Size(334, 155);
this.label27.TabIndex = 3;
this.label27.Text = "9999";
this.label27.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -785,20 +785,20 @@
// label26
//
this.label26.AutoSize = true;
- this.label26.Location = new System.Drawing.Point(22, 327);
- this.label26.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label26.Location = new System.Drawing.Point(24, 374);
+ this.label26.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label26.Name = "label26";
- this.label26.Size = new System.Drawing.Size(230, 51);
+ this.label26.Size = new System.Drawing.Size(261, 58);
this.label26.TabIndex = 2;
this.label26.Text = "完成数量";
//
// label17
//
this.label17.Font = new System.Drawing.Font("宋体", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label17.Location = new System.Drawing.Point(2, 119);
- this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label17.Location = new System.Drawing.Point(2, 136);
+ this.label17.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(306, 136);
+ this.label17.Size = new System.Drawing.Size(334, 155);
this.label17.TabIndex = 1;
this.label17.Text = "9999";
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -806,10 +806,10 @@
// label16
//
this.label16.AutoSize = true;
- this.label16.Location = new System.Drawing.Point(22, 46);
- this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label16.Location = new System.Drawing.Point(24, 53);
+ this.label16.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label16.Name = "label16";
- this.label16.Size = new System.Drawing.Size(230, 51);
+ this.label16.Size = new System.Drawing.Size(261, 58);
this.label16.TabIndex = 0;
this.label16.Text = "计划数量";
//
@@ -818,9 +818,9 @@
this.panel36.Controls.Add(this.label11);
this.panel36.Dock = System.Windows.Forms.DockStyle.Top;
this.panel36.Location = new System.Drawing.Point(0, 0);
- this.panel36.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel36.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel36.Name = "panel36";
- this.panel36.Size = new System.Drawing.Size(310, 406);
+ this.panel36.Size = new System.Drawing.Size(338, 464);
this.panel36.TabIndex = 0;
//
// label11
@@ -829,9 +829,9 @@
this.label11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label11.Dock = System.Windows.Forms.DockStyle.Fill;
this.label11.Location = new System.Drawing.Point(0, 0);
- this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label11.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(310, 406);
+ this.label11.Size = new System.Drawing.Size(338, 464);
this.label11.TabIndex = 0;
this.label11.Text = "打印记录：";
this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -842,9 +842,9 @@
this.panel8.Controls.Add(this.panel9);
this.panel8.Dock = System.Windows.Forms.DockStyle.Top;
this.panel8.Location = new System.Drawing.Point(0, 0);
- this.panel8.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel8.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel8.Name = "panel8";
- this.panel8.Size = new System.Drawing.Size(2347, 91);
+ this.panel8.Size = new System.Drawing.Size(2560, 104);
this.panel8.TabIndex = 0;
//
// panel10
@@ -852,10 +852,10 @@
this.panel10.Controls.Add(this.panel12);
this.panel10.Controls.Add(this.panel11);
this.panel10.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel10.Location = new System.Drawing.Point(310, 0);
- this.panel10.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel10.Location = new System.Drawing.Point(338, 0);
+ this.panel10.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel10.Name = "panel10";
- this.panel10.Size = new System.Drawing.Size(2037, 91);
+ this.panel10.Size = new System.Drawing.Size(2222, 104);
this.panel10.TabIndex = 1;
//
// panel12
@@ -863,10 +863,10 @@
this.panel12.Controls.Add(this.panel16);
this.panel12.Controls.Add(this.panel15);
this.panel12.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel12.Location = new System.Drawing.Point(451, 0);
- this.panel12.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel12.Location = new System.Drawing.Point(492, 0);
+ this.panel12.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel12.Name = "panel12";
- this.panel12.Size = new System.Drawing.Size(1586, 91);
+ this.panel12.Size = new System.Drawing.Size(1730, 104);
this.panel12.TabIndex = 1;
//
// panel16
@@ -874,10 +874,10 @@
this.panel16.Controls.Add(this.panel20);
this.panel16.Controls.Add(this.panel19);
this.panel16.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel16.Location = new System.Drawing.Point(468, 0);
- this.panel16.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel16.Location = new System.Drawing.Point(511, 0);
+ this.panel16.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel16.Name = "panel16";
- this.panel16.Size = new System.Drawing.Size(1118, 91);
+ this.panel16.Size = new System.Drawing.Size(1219, 104);
this.panel16.TabIndex = 1;
//
// panel20
@@ -885,10 +885,10 @@
this.panel20.Controls.Add(this.label10);
this.panel20.Controls.Add(this.panel22);
this.panel20.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel20.Location = new System.Drawing.Point(427, 0);
- this.panel20.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel20.Location = new System.Drawing.Point(466, 0);
+ this.panel20.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel20.Name = "panel20";
- this.panel20.Size = new System.Drawing.Size(691, 91);
+ this.panel20.Size = new System.Drawing.Size(753, 104);
this.panel20.TabIndex = 1;
//
// label10
@@ -896,10 +896,10 @@
this.label10.BackColor = System.Drawing.Color.DeepSkyBlue;
this.label10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label10.Dock = System.Windows.Forms.DockStyle.Fill;
- this.label10.Location = new System.Drawing.Point(341, 0);
- this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label10.Location = new System.Drawing.Point(372, 0);
+ this.label10.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(350, 91);
+ this.label10.Size = new System.Drawing.Size(381, 104);
this.label10.TabIndex = 1;
this.label10.Text = "停机录入";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -910,9 +910,9 @@
this.panel22.Controls.Add(this.label9);
this.panel22.Dock = System.Windows.Forms.DockStyle.Left;
this.panel22.Location = new System.Drawing.Point(0, 0);
- this.panel22.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel22.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel22.Name = "panel22";
- this.panel22.Size = new System.Drawing.Size(341, 91);
+ this.panel22.Size = new System.Drawing.Size(372, 104);
this.panel22.TabIndex = 0;
//
// label9
@@ -922,9 +922,9 @@
this.label9.Dock = System.Windows.Forms.DockStyle.Fill;
this.label9.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
this.label9.Location = new System.Drawing.Point(0, 0);
- this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label9.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(341, 91);
+ this.label9.Size = new System.Drawing.Size(372, 104);
this.label9.TabIndex = 0;
this.label9.Text = "质量录入";
this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -936,9 +936,9 @@
this.panel19.Controls.Add(this.panel21);
this.panel19.Dock = System.Windows.Forms.DockStyle.Left;
this.panel19.Location = new System.Drawing.Point(0, 0);
- this.panel19.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel19.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel19.Name = "panel19";
- this.panel19.Size = new System.Drawing.Size(427, 91);
+ this.panel19.Size = new System.Drawing.Size(466, 104);
this.panel19.TabIndex = 0;
//
// label8
@@ -946,10 +946,10 @@
this.label8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label8.Dock = System.Windows.Forms.DockStyle.Fill;
this.label8.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
- this.label8.Location = new System.Drawing.Point(202, 0);
- this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label8.Location = new System.Drawing.Point(220, 0);
+ this.label8.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(225, 91);
+ this.label8.Size = new System.Drawing.Size(246, 104);
this.label8.TabIndex = 1;
this.label8.Text = "cy";
this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -959,9 +959,9 @@
this.panel21.Controls.Add(this.label7);
this.panel21.Dock = System.Windows.Forms.DockStyle.Left;
this.panel21.Location = new System.Drawing.Point(0, 0);
- this.panel21.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel21.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel21.Name = "panel21";
- this.panel21.Size = new System.Drawing.Size(202, 91);
+ this.panel21.Size = new System.Drawing.Size(220, 104);
this.panel21.TabIndex = 0;
//
// label7
@@ -971,9 +971,9 @@
this.label7.Dock = System.Windows.Forms.DockStyle.Fill;
this.label7.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
this.label7.Location = new System.Drawing.Point(0, 0);
- this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label7.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(202, 91);
+ this.label7.Size = new System.Drawing.Size(220, 104);
this.label7.TabIndex = 0;
this.label7.Text = "用户：";
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -984,19 +984,19 @@
this.panel15.Controls.Add(this.panel17);
this.panel15.Dock = System.Windows.Forms.DockStyle.Left;
this.panel15.Location = new System.Drawing.Point(0, 0);
- this.panel15.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel15.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel15.Name = "panel15";
- this.panel15.Size = new System.Drawing.Size(468, 91);
+ this.panel15.Size = new System.Drawing.Size(511, 104);
this.panel15.TabIndex = 0;
//
// panel18
//
this.panel18.Controls.Add(this.label6);
this.panel18.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel18.Location = new System.Drawing.Point(202, 0);
- this.panel18.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel18.Location = new System.Drawing.Point(220, 0);
+ this.panel18.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel18.Name = "panel18";
- this.panel18.Size = new System.Drawing.Size(266, 91);
+ this.panel18.Size = new System.Drawing.Size(291, 104);
this.panel18.TabIndex = 1;
//
// label6
@@ -1005,9 +1005,9 @@
this.label6.Dock = System.Windows.Forms.DockStyle.Fill;
this.label6.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
this.label6.Location = new System.Drawing.Point(0, 0);
- this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label6.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(266, 91);
+ this.label6.Size = new System.Drawing.Size(291, 104);
this.label6.TabIndex = 0;
this.label6.Text = "IM01";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1017,9 +1017,9 @@
this.panel17.Controls.Add(this.label5);
this.panel17.Dock = System.Windows.Forms.DockStyle.Left;
this.panel17.Location = new System.Drawing.Point(0, 0);
- this.panel17.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel17.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel17.Name = "panel17";
- this.panel17.Size = new System.Drawing.Size(202, 91);
+ this.panel17.Size = new System.Drawing.Size(220, 104);
this.panel17.TabIndex = 0;
//
// label5
@@ -1029,9 +1029,9 @@
this.label5.Dock = System.Windows.Forms.DockStyle.Fill;
this.label5.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
this.label5.Location = new System.Drawing.Point(0, 0);
- this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label5.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(202, 91);
+ this.label5.Size = new System.Drawing.Size(220, 104);
this.label5.TabIndex = 0;
this.label5.Text = "工位：";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1042,19 +1042,19 @@
this.panel11.Controls.Add(this.panel13);
this.panel11.Dock = System.Windows.Forms.DockStyle.Left;
this.panel11.Location = new System.Drawing.Point(0, 0);
- this.panel11.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel11.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel11.Name = "panel11";
- this.panel11.Size = new System.Drawing.Size(451, 91);
+ this.panel11.Size = new System.Drawing.Size(492, 104);
this.panel11.TabIndex = 0;
//
// panel14
//
this.panel14.Controls.Add(this.comboBox1);
this.panel14.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel14.Location = new System.Drawing.Point(202, 0);
- this.panel14.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel14.Location = new System.Drawing.Point(220, 0);
+ this.panel14.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel14.Name = "panel14";
- this.panel14.Size = new System.Drawing.Size(249, 91);
+ this.panel14.Size = new System.Drawing.Size(272, 104);
this.panel14.TabIndex = 1;
//
// comboBox1
@@ -1067,9 +1067,9 @@
"A班",
"B班"});
this.comboBox1.Location = new System.Drawing.Point(0, 0);
- this.comboBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.comboBox1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.comboBox1.Name = "comboBox1";
- this.comboBox1.Size = new System.Drawing.Size(249, 83);
+ this.comboBox1.Size = new System.Drawing.Size(272, 93);
this.comboBox1.TabIndex = 0;
this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
//
@@ -1078,9 +1078,9 @@
this.panel13.Controls.Add(this.label4);
this.panel13.Dock = System.Windows.Forms.DockStyle.Left;
this.panel13.Location = new System.Drawing.Point(0, 0);
- this.panel13.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel13.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel13.Name = "panel13";
- this.panel13.Size = new System.Drawing.Size(202, 91);
+ this.panel13.Size = new System.Drawing.Size(220, 104);
this.panel13.TabIndex = 0;
//
// label4
@@ -1090,9 +1090,9 @@
this.label4.Dock = System.Windows.Forms.DockStyle.Fill;
this.label4.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
this.label4.Location = new System.Drawing.Point(0, 0);
- this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label4.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(202, 91);
+ this.label4.Size = new System.Drawing.Size(220, 104);
this.label4.TabIndex = 0;
this.label4.Text = "班组：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1102,9 +1102,9 @@
this.panel9.Controls.Add(this.label3);
this.panel9.Dock = System.Windows.Forms.DockStyle.Left;
this.panel9.Location = new System.Drawing.Point(0, 0);
- this.panel9.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel9.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel9.Name = "panel9";
- this.panel9.Size = new System.Drawing.Size(310, 91);
+ this.panel9.Size = new System.Drawing.Size(338, 104);
this.panel9.TabIndex = 0;
//
// label3
@@ -1114,9 +1114,9 @@
this.label3.Dock = System.Windows.Forms.DockStyle.Fill;
this.label3.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
this.label3.Location = new System.Drawing.Point(0, 0);
- this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label3.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(310, 91);
+ this.label3.Size = new System.Drawing.Size(338, 104);
this.label3.TabIndex = 0;
this.label3.Text = "用户信息：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1127,9 +1127,9 @@
this.panel2.Controls.Add(this.panel3);
this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
this.panel2.Location = new System.Drawing.Point(0, 0);
- this.panel2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel2.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(2347, 147);
+ this.panel2.Size = new System.Drawing.Size(2560, 168);
this.panel2.TabIndex = 0;
//
// panel4
@@ -1137,10 +1137,10 @@
this.panel4.Controls.Add(this.panel6);
this.panel4.Controls.Add(this.panel5);
this.panel4.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel4.Location = new System.Drawing.Point(310, 0);
- this.panel4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel4.Location = new System.Drawing.Point(338, 0);
+ this.panel4.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel4.Name = "panel4";
- this.panel4.Size = new System.Drawing.Size(2037, 147);
+ this.panel4.Size = new System.Drawing.Size(2222, 168);
this.panel4.TabIndex = 1;
//
// panel6
@@ -1148,9 +1148,9 @@
this.panel6.Controls.Add(this.label1);
this.panel6.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel6.Location = new System.Drawing.Point(0, 0);
- this.panel6.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel6.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel6.Name = "panel6";
- this.panel6.Size = new System.Drawing.Size(1685, 147);
+ this.panel6.Size = new System.Drawing.Size(1838, 168);
this.panel6.TabIndex = 1;
//
// label1
@@ -1159,9 +1159,9 @@
this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
this.label1.Font = new System.Drawing.Font("宋体", 36F, System.Drawing.FontStyle.Bold);
this.label1.Location = new System.Drawing.Point(0, 0);
- this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label1.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(1685, 147);
+ this.label1.Size = new System.Drawing.Size(1838, 168);
this.label1.TabIndex = 0;
this.label1.Text = "注塑车间条码打印";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1170,10 +1170,10 @@
//
this.panel5.Controls.Add(this.label2);
this.panel5.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel5.Location = new System.Drawing.Point(1685, 0);
- this.panel5.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel5.Location = new System.Drawing.Point(1838, 0);
+ this.panel5.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel5.Name = "panel5";
- this.panel5.Size = new System.Drawing.Size(352, 147);
+ this.panel5.Size = new System.Drawing.Size(384, 168);
this.panel5.TabIndex = 0;
//
// label2
@@ -1182,9 +1182,9 @@
this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
this.label2.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold);
this.label2.Location = new System.Drawing.Point(0, 0);
- this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label2.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(352, 147);
+ this.label2.Size = new System.Drawing.Size(384, 168);
this.label2.TabIndex = 0;
this.label2.Text = "2019-05-29 10:30:31";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1195,19 +1195,19 @@
this.panel3.Controls.Add(this.pictureBox1);
this.panel3.Dock = System.Windows.Forms.DockStyle.Left;
this.panel3.Location = new System.Drawing.Point(0, 0);
- this.panel3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel3.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(310, 147);
+ this.panel3.Size = new System.Drawing.Size(338, 168);
this.panel3.TabIndex = 0;
//
// pictureBox1
//
this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
- this.pictureBox1.Location = new System.Drawing.Point(6, 5);
- this.pictureBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.pictureBox1.Location = new System.Drawing.Point(7, 6);
+ this.pictureBox1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(308, 140);
+ this.pictureBox1.Size = new System.Drawing.Size(336, 160);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox1.TabIndex = 0;
this.pictureBox1.TabStop = false;
@@ -1233,12 +1233,12 @@
//
// FrmMain
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(2347, 1539);
+ this.ClientSize = new System.Drawing.Size(2560, 1759);
this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
- this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.Name = "FrmMain";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "FrmMain";
diff --git a/InjectionPC/FrmMain2408.Designer.cs b/InjectionPC/FrmMain2408.Designer.cs
index ef0d381..522a06a 100644
--- a/InjectionPC/FrmMain2408.Designer.cs
+++ b/InjectionPC/FrmMain2408.Designer.cs
@@ -46,6 +46,7 @@
this.panel40 = new System.Windows.Forms.Panel();
this.panel42 = new System.Windows.Forms.Panel();
this.panel39 = new System.Windows.Forms.Panel();
+ this.cboxHandBox = new System.Windows.Forms.CheckBox();
this.textBox2 = new System.Windows.Forms.TextBox();
this.label18 = new System.Windows.Forms.Label();
this.label19 = new System.Windows.Forms.Label();
@@ -79,13 +80,35 @@
this.label24 = new System.Windows.Forms.Label();
this.glacialList1 = new GlacialComponents.Controls.GlacialList();
this.panel25 = new System.Windows.Forms.Panel();
+ this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
this.panel38 = new System.Windows.Forms.Panel();
this.label27 = new System.Windows.Forms.Label();
this.label26 = new System.Windows.Forms.Label();
this.label17 = new System.Windows.Forms.Label();
this.label16 = new System.Windows.Forms.Label();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
+ this.comBoxSizeR = new System.Windows.Forms.ComboBox();
+ this.panel47 = new System.Windows.Forms.Panel();
+ this.btnHandPrintR = new System.Windows.Forms.Button();
+ this.label30 = new System.Windows.Forms.Label();
+ this.lbNeedQtyR = new System.Windows.Forms.Label();
+ this.lbCurrentlQtyR = new System.Windows.Forms.Label();
+ this.label34 = new System.Windows.Forms.Label();
+ this.lbPackageCodeR = new System.Windows.Forms.Label();
this.panel36 = new System.Windows.Forms.Panel();
+ this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.label11 = new System.Windows.Forms.Label();
+ this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel();
+ this.comBoxSizeL = new System.Windows.Forms.ComboBox();
+ this.label38 = new System.Windows.Forms.Label();
+ this.panel46 = new System.Windows.Forms.Panel();
+ this.btnHandPrintL = new System.Windows.Forms.Button();
+ this.label31 = new System.Windows.Forms.Label();
+ this.lbNeedQtyL = new System.Windows.Forms.Label();
+ this.lbCurrentlQtyL = new System.Windows.Forms.Label();
+ this.lbPackageCodeL = new System.Windows.Forms.Label();
this.panel8 = new System.Windows.Forms.Panel();
this.panel10 = new System.Windows.Forms.Panel();
this.panel12 = new System.Windows.Forms.Panel();
@@ -118,6 +141,8 @@
this.label2 = new System.Windows.Forms.Label();
this.panel3 = new System.Windows.Forms.Panel();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
+ this.label35 = new System.Windows.Forms.Label();
+ this.label39 = new System.Windows.Forms.Label();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.serialPort1 = new System.IO.Ports.SerialPort(this.components);
this.timer2 = new System.Windows.Forms.Timer(this.components);
@@ -145,8 +170,16 @@
this.panel45.SuspendLayout();
this.panel44.SuspendLayout();
this.panel25.SuspendLayout();
+ this.tableLayoutPanel2.SuspendLayout();
this.panel38.SuspendLayout();
+ this.groupBox1.SuspendLayout();
+ this.tableLayoutPanel3.SuspendLayout();
+ this.panel47.SuspendLayout();
this.panel36.SuspendLayout();
+ this.tableLayoutPanel1.SuspendLayout();
+ this.groupBox2.SuspendLayout();
+ this.tableLayoutPanel4.SuspendLayout();
+ this.panel46.SuspendLayout();
this.panel8.SuspendLayout();
this.panel10.SuspendLayout();
this.panel12.SuspendLayout();
@@ -176,9 +209,9 @@
this.panel1.Controls.Add(this.panel2);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0);
- this.panel1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel1.Margin = new System.Windows.Forms.Padding(5);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(2347, 1539);
+ this.panel1.Size = new System.Drawing.Size(2560, 1651);
this.panel1.TabIndex = 0;
//
// panel7
@@ -187,10 +220,10 @@
this.panel7.Controls.Add(this.panel8);
this.panel7.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel7.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
- this.panel7.Location = new System.Drawing.Point(0, 147);
- this.panel7.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel7.Location = new System.Drawing.Point(0, 168);
+ this.panel7.Margin = new System.Windows.Forms.Padding(5);
this.panel7.Name = "panel7";
- this.panel7.Size = new System.Drawing.Size(2347, 1392);
+ this.panel7.Size = new System.Drawing.Size(2560, 1483);
this.panel7.TabIndex = 1;
//
// panel23
@@ -198,10 +231,10 @@
this.panel23.Controls.Add(this.panel27);
this.panel23.Controls.Add(this.panel24);
this.panel23.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel23.Location = new System.Drawing.Point(0, 91);
- this.panel23.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel23.Location = new System.Drawing.Point(0, 104);
+ this.panel23.Margin = new System.Windows.Forms.Padding(5);
this.panel23.Name = "panel23";
- this.panel23.Size = new System.Drawing.Size(2347, 1301);
+ this.panel23.Size = new System.Drawing.Size(2560, 1379);
this.panel23.TabIndex = 1;
//
// panel27
@@ -209,10 +242,10 @@
this.panel27.Controls.Add(this.panel29);
this.panel27.Controls.Add(this.panel28);
this.panel27.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel27.Location = new System.Drawing.Point(0, 975);
- this.panel27.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel27.Location = new System.Drawing.Point(0, 1115);
+ this.panel27.Margin = new System.Windows.Forms.Padding(5);
this.panel27.Name = "panel27";
- this.panel27.Size = new System.Drawing.Size(2347, 326);
+ this.panel27.Size = new System.Drawing.Size(2560, 264);
this.panel27.TabIndex = 1;
//
// panel29
@@ -220,10 +253,10 @@
this.panel29.Controls.Add(this.panel31);
this.panel29.Controls.Add(this.panel30);
this.panel29.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel29.Location = new System.Drawing.Point(310, 0);
- this.panel29.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel29.Location = new System.Drawing.Point(339, 0);
+ this.panel29.Margin = new System.Windows.Forms.Padding(5);
this.panel29.Name = "panel29";
- this.panel29.Size = new System.Drawing.Size(2037, 326);
+ this.panel29.Size = new System.Drawing.Size(2221, 264);
this.panel29.TabIndex = 1;
//
// panel31
@@ -231,10 +264,10 @@
this.panel31.Controls.Add(this.panel33);
this.panel31.Controls.Add(this.panel32);
this.panel31.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel31.Location = new System.Drawing.Point(123, 0);
- this.panel31.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel31.Location = new System.Drawing.Point(133, 0);
+ this.panel31.Margin = new System.Windows.Forms.Padding(5);
this.panel31.Name = "panel31";
- this.panel31.Size = new System.Drawing.Size(1914, 326);
+ this.panel31.Size = new System.Drawing.Size(2088, 264);
this.panel31.TabIndex = 1;
//
// panel33
@@ -242,10 +275,10 @@
this.panel33.Controls.Add(this.panel35);
this.panel33.Controls.Add(this.panel34);
this.panel33.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel33.Location = new System.Drawing.Point(123, 0);
- this.panel33.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel33.Location = new System.Drawing.Point(133, 0);
+ this.panel33.Margin = new System.Windows.Forms.Padding(5);
this.panel33.Name = "panel33";
- this.panel33.Size = new System.Drawing.Size(1791, 326);
+ this.panel33.Size = new System.Drawing.Size(1955, 264);
this.panel33.TabIndex = 1;
//
// panel35
@@ -253,9 +286,9 @@
this.panel35.Controls.Add(this.panel37);
this.panel35.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel35.Location = new System.Drawing.Point(0, 0);
- this.panel35.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel35.Margin = new System.Windows.Forms.Padding(5);
this.panel35.Name = "panel35";
- this.panel35.Size = new System.Drawing.Size(1668, 326);
+ this.panel35.Size = new System.Drawing.Size(1822, 264);
this.panel35.TabIndex = 1;
//
// panel37
@@ -263,9 +296,9 @@
this.panel37.Controls.Add(this.panel40);
this.panel37.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel37.Location = new System.Drawing.Point(0, 0);
- this.panel37.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel37.Margin = new System.Windows.Forms.Padding(5);
this.panel37.Name = "panel37";
- this.panel37.Size = new System.Drawing.Size(1668, 326);
+ this.panel37.Size = new System.Drawing.Size(1822, 264);
this.panel37.TabIndex = 1;
//
// panel40
@@ -274,9 +307,9 @@
this.panel40.Controls.Add(this.panel41);
this.panel40.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel40.Location = new System.Drawing.Point(0, 0);
- this.panel40.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel40.Margin = new System.Windows.Forms.Padding(5);
this.panel40.Name = "panel40";
- this.panel40.Size = new System.Drawing.Size(1668, 326);
+ this.panel40.Size = new System.Drawing.Size(1822, 264);
this.panel40.TabIndex = 1;
//
// panel42
@@ -285,15 +318,16 @@
this.panel42.Controls.Add(this.panel43);
this.panel42.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel42.Location = new System.Drawing.Point(0, 0);
- this.panel42.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel42.Margin = new System.Windows.Forms.Padding(5);
this.panel42.Name = "panel42";
- this.panel42.Size = new System.Drawing.Size(1545, 326);
+ this.panel42.Size = new System.Drawing.Size(1689, 264);
this.panel42.TabIndex = 1;
//
// panel39
//
this.panel39.BackColor = System.Drawing.Color.Aquamarine;
this.panel39.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.panel39.Controls.Add(this.cboxHandBox);
this.panel39.Controls.Add(this.textBox2);
this.panel39.Controls.Add(this.label18);
this.panel39.Controls.Add(this.label19);
@@ -303,28 +337,44 @@
this.panel39.Controls.Add(this.label21);
this.panel39.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel39.Location = new System.Drawing.Point(0, 0);
- this.panel39.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel39.Margin = new System.Windows.Forms.Padding(5);
this.panel39.Name = "panel39";
- this.panel39.Size = new System.Drawing.Size(1422, 326);
+ this.panel39.Size = new System.Drawing.Size(1556, 264);
this.panel39.TabIndex = 1;
//
+ // cboxHandBox
+ //
+ this.cboxHandBox.AutoSize = true;
+ this.cboxHandBox.Checked = true;
+ this.cboxHandBox.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.cboxHandBox.Enabled = false;
+ this.cboxHandBox.Location = new System.Drawing.Point(1008, 196);
+ this.cboxHandBox.Margin = new System.Windows.Forms.Padding(4);
+ this.cboxHandBox.Name = "cboxHandBox";
+ this.cboxHandBox.Size = new System.Drawing.Size(293, 62);
+ this.cboxHandBox.TabIndex = 14;
+ this.cboxHandBox.Tag = "true";
+ this.cboxHandBox.Text = "打印箱码";
+ this.cboxHandBox.UseVisualStyleBackColor = true;
+ this.cboxHandBox.CheckedChanged += new System.EventHandler(this.cboxHandBox_CheckedChanged);
+ //
// textBox2
//
this.textBox2.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox2.Location = new System.Drawing.Point(220, 292);
- this.textBox2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.textBox2.Location = new System.Drawing.Point(240, 333);
+ this.textBox2.Margin = new System.Windows.Forms.Padding(5);
this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(303, 65);
+ this.textBox2.Size = new System.Drawing.Size(329, 74);
this.textBox2.TabIndex = 13;
//
// label18
//
this.label18.AutoSize = true;
this.label18.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label18.Location = new System.Drawing.Point(40, 303);
- this.label18.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label18.Location = new System.Drawing.Point(44, 347);
+ this.label18.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label18.Name = "label18";
- this.label18.Size = new System.Drawing.Size(178, 51);
+ this.label18.Size = new System.Drawing.Size(202, 58);
this.label18.TabIndex = 12;
this.label18.Text = "数量：";
//
@@ -332,10 +382,10 @@
//
this.label19.AutoSize = true;
this.label19.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label19.Location = new System.Drawing.Point(607, 177);
- this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label19.Location = new System.Drawing.Point(661, 203);
+ this.label19.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label19.Name = "label19";
- this.label19.Size = new System.Drawing.Size(238, 51);
+ this.label19.Size = new System.Drawing.Size(265, 58);
this.label19.TabIndex = 11;
this.label19.Text = "(yyMMdd)";
//
@@ -343,20 +393,20 @@
//
this.textBox1.Enabled = false;
this.textBox1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox1.Location = new System.Drawing.Point(222, 172);
- this.textBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.textBox1.Location = new System.Drawing.Point(243, 196);
+ this.textBox1.Margin = new System.Windows.Forms.Padding(5);
this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(301, 65);
+ this.textBox1.Size = new System.Drawing.Size(328, 74);
this.textBox1.TabIndex = 10;
//
// label20
//
this.label20.AutoSize = true;
this.label20.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label20.Location = new System.Drawing.Point(42, 186);
- this.label20.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label20.Location = new System.Drawing.Point(45, 212);
+ this.label20.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label20.Name = "label20";
- this.label20.Size = new System.Drawing.Size(178, 51);
+ this.label20.Size = new System.Drawing.Size(202, 58);
this.label20.TabIndex = 9;
this.label20.Text = "批次：";
//
@@ -365,10 +415,10 @@
this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBox2.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.comboBox2.FormattingEnabled = true;
- this.comboBox2.Location = new System.Drawing.Point(222, 63);
- this.comboBox2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.comboBox2.Location = new System.Drawing.Point(243, 72);
+ this.comboBox2.Margin = new System.Windows.Forms.Padding(5);
this.comboBox2.Name = "comboBox2";
- this.comboBox2.Size = new System.Drawing.Size(851, 50);
+ this.comboBox2.Size = new System.Drawing.Size(928, 56);
this.comboBox2.TabIndex = 8;
this.comboBox2.TextChanged += new System.EventHandler(this.comboBox2_TextChanged);
//
@@ -376,10 +426,10 @@
//
this.label21.AutoSize = true;
this.label21.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label21.Location = new System.Drawing.Point(42, 70);
- this.label21.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label21.Location = new System.Drawing.Point(45, 80);
+ this.label21.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label21.Name = "label21";
- this.label21.Size = new System.Drawing.Size(178, 51);
+ this.label21.Size = new System.Drawing.Size(202, 58);
this.label21.TabIndex = 7;
this.label21.Text = "产品：";
//
@@ -387,10 +437,10 @@
//
this.panel43.Controls.Add(this.label23);
this.panel43.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel43.Location = new System.Drawing.Point(1422, 0);
- this.panel43.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel43.Location = new System.Drawing.Point(1556, 0);
+ this.panel43.Margin = new System.Windows.Forms.Padding(5);
this.panel43.Name = "panel43";
- this.panel43.Size = new System.Drawing.Size(123, 326);
+ this.panel43.Size = new System.Drawing.Size(133, 264);
this.panel43.TabIndex = 0;
//
// label23
@@ -399,9 +449,9 @@
this.label23.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label23.Dock = System.Windows.Forms.DockStyle.Fill;
this.label23.Location = new System.Drawing.Point(0, 0);
- this.label23.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label23.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(123, 326);
+ this.label23.Size = new System.Drawing.Size(133, 264);
this.label23.TabIndex = 0;
this.label23.Text = "手工打印条码";
this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -411,10 +461,10 @@
//
this.panel41.Controls.Add(this.label22);
this.panel41.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel41.Location = new System.Drawing.Point(1545, 0);
- this.panel41.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel41.Location = new System.Drawing.Point(1689, 0);
+ this.panel41.Margin = new System.Windows.Forms.Padding(5);
this.panel41.Name = "panel41";
- this.panel41.Size = new System.Drawing.Size(123, 326);
+ this.panel41.Size = new System.Drawing.Size(133, 264);
this.panel41.TabIndex = 0;
//
// label22
@@ -423,9 +473,9 @@
this.label22.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label22.Dock = System.Windows.Forms.DockStyle.Fill;
this.label22.Location = new System.Drawing.Point(0, 0);
- this.label22.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label22.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label22.Name = "label22";
- this.label22.Size = new System.Drawing.Size(123, 326);
+ this.label22.Size = new System.Drawing.Size(133, 264);
this.label22.TabIndex = 0;
this.label22.Text = "补打条码";
this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -435,10 +485,10 @@
//
this.panel34.Controls.Add(this.label15);
this.panel34.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel34.Location = new System.Drawing.Point(1668, 0);
- this.panel34.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel34.Location = new System.Drawing.Point(1822, 0);
+ this.panel34.Margin = new System.Windows.Forms.Padding(5);
this.panel34.Name = "panel34";
- this.panel34.Size = new System.Drawing.Size(123, 326);
+ this.panel34.Size = new System.Drawing.Size(133, 264);
this.panel34.TabIndex = 0;
//
// label15
@@ -447,9 +497,9 @@
this.label15.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label15.Dock = System.Windows.Forms.DockStyle.Fill;
this.label15.Location = new System.Drawing.Point(0, 0);
- this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label15.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(123, 326);
+ this.label15.Size = new System.Drawing.Size(133, 264);
this.label15.TabIndex = 0;
this.label15.Text = "删除条码";
this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -460,9 +510,9 @@
this.panel32.Controls.Add(this.label14);
this.panel32.Dock = System.Windows.Forms.DockStyle.Left;
this.panel32.Location = new System.Drawing.Point(0, 0);
- this.panel32.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel32.Margin = new System.Windows.Forms.Padding(5);
this.panel32.Name = "panel32";
- this.panel32.Size = new System.Drawing.Size(123, 326);
+ this.panel32.Size = new System.Drawing.Size(133, 264);
this.panel32.TabIndex = 0;
//
// label14
@@ -471,9 +521,9 @@
this.label14.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label14.Dock = System.Windows.Forms.DockStyle.Fill;
this.label14.Location = new System.Drawing.Point(0, 0);
- this.label14.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label14.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(123, 326);
+ this.label14.Size = new System.Drawing.Size(133, 264);
this.label14.TabIndex = 0;
this.label14.Text = "下一计划";
this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -484,9 +534,9 @@
this.panel30.Controls.Add(this.label13);
this.panel30.Dock = System.Windows.Forms.DockStyle.Left;
this.panel30.Location = new System.Drawing.Point(0, 0);
- this.panel30.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel30.Margin = new System.Windows.Forms.Padding(5);
this.panel30.Name = "panel30";
- this.panel30.Size = new System.Drawing.Size(123, 326);
+ this.panel30.Size = new System.Drawing.Size(133, 264);
this.panel30.TabIndex = 0;
//
// label13
@@ -495,9 +545,9 @@
this.label13.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label13.Dock = System.Windows.Forms.DockStyle.Fill;
this.label13.Location = new System.Drawing.Point(0, 0);
- this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label13.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(123, 326);
+ this.label13.Size = new System.Drawing.Size(133, 264);
this.label13.TabIndex = 0;
this.label13.Text = "暂停打印";
this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -508,9 +558,9 @@
this.panel28.Controls.Add(this.label12);
this.panel28.Dock = System.Windows.Forms.DockStyle.Left;
this.panel28.Location = new System.Drawing.Point(0, 0);
- this.panel28.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel28.Margin = new System.Windows.Forms.Padding(5);
this.panel28.Name = "panel28";
- this.panel28.Size = new System.Drawing.Size(310, 326);
+ this.panel28.Size = new System.Drawing.Size(339, 264);
this.panel28.TabIndex = 0;
//
// label12
@@ -520,9 +570,9 @@
this.label12.Dock = System.Windows.Forms.DockStyle.Fill;
this.label12.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label12.Location = new System.Drawing.Point(0, 0);
- this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label12.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(310, 326);
+ this.label12.Size = new System.Drawing.Size(339, 264);
this.label12.TabIndex = 0;
this.label12.Text = "打印信息：";
this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -533,9 +583,9 @@
this.panel24.Controls.Add(this.panel25);
this.panel24.Dock = System.Windows.Forms.DockStyle.Top;
this.panel24.Location = new System.Drawing.Point(0, 0);
- this.panel24.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel24.Margin = new System.Windows.Forms.Padding(5);
this.panel24.Name = "panel24";
- this.panel24.Size = new System.Drawing.Size(2347, 975);
+ this.panel24.Size = new System.Drawing.Size(2560, 1115);
this.panel24.TabIndex = 0;
//
// panel26
@@ -544,10 +594,10 @@
this.panel26.Controls.Add(this.panel44);
this.panel26.Controls.Add(this.glacialList1);
this.panel26.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel26.Location = new System.Drawing.Point(310, 0);
- this.panel26.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel26.Location = new System.Drawing.Point(339, 0);
+ this.panel26.Margin = new System.Windows.Forms.Padding(5);
this.panel26.Name = "panel26";
- this.panel26.Size = new System.Drawing.Size(2037, 975);
+ this.panel26.Size = new System.Drawing.Size(2221, 1115);
this.panel26.TabIndex = 1;
//
// panel45
@@ -557,19 +607,19 @@
this.panel45.Controls.Add(this.button4);
this.panel45.Controls.Add(this.textBox4);
this.panel45.Controls.Add(this.label25);
- this.panel45.Location = new System.Drawing.Point(295, 592);
- this.panel45.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel45.Location = new System.Drawing.Point(323, 676);
+ this.panel45.Margin = new System.Windows.Forms.Padding(5);
this.panel45.Name = "panel45";
- this.panel45.Size = new System.Drawing.Size(1280, 132);
+ this.panel45.Size = new System.Drawing.Size(1397, 150);
this.panel45.TabIndex = 2;
//
// button3
//
this.button3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button3.Location = new System.Drawing.Point(1129, 37);
- this.button3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.button3.Location = new System.Drawing.Point(1232, 43);
+ this.button3.Margin = new System.Windows.Forms.Padding(5);
this.button3.Name = "button3";
- this.button3.Size = new System.Drawing.Size(147, 52);
+ this.button3.Size = new System.Drawing.Size(160, 60);
this.button3.TabIndex = 5;
this.button3.Text = "取消";
this.button3.UseVisualStyleBackColor = true;
@@ -578,10 +628,10 @@
// button4
//
this.button4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button4.Location = new System.Drawing.Point(952, 38);
- this.button4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.button4.Location = new System.Drawing.Point(1037, 44);
+ this.button4.Margin = new System.Windows.Forms.Padding(5);
this.button4.Name = "button4";
- this.button4.Size = new System.Drawing.Size(147, 52);
+ this.button4.Size = new System.Drawing.Size(160, 60);
this.button4.TabIndex = 4;
this.button4.Text = "切换";
this.button4.UseVisualStyleBackColor = true;
@@ -590,20 +640,20 @@
// textBox4
//
this.textBox4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox4.Location = new System.Drawing.Point(308, 40);
- this.textBox4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.textBox4.Location = new System.Drawing.Point(336, 45);
+ this.textBox4.Margin = new System.Windows.Forms.Padding(5);
this.textBox4.Name = "textBox4";
- this.textBox4.Size = new System.Drawing.Size(605, 49);
+ this.textBox4.Size = new System.Drawing.Size(660, 55);
this.textBox4.TabIndex = 3;
//
// label25
//
this.label25.AutoSize = true;
this.label25.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label25.Location = new System.Drawing.Point(26, 46);
- this.label25.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label25.Location = new System.Drawing.Point(28, 52);
+ this.label25.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label25.Name = "label25";
- this.label25.Size = new System.Drawing.Size(283, 37);
+ this.label25.Size = new System.Drawing.Size(319, 42);
this.label25.TabIndex = 2;
this.label25.Text = "扫描模具条码：";
this.label25.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -615,19 +665,19 @@
this.panel44.Controls.Add(this.button1);
this.panel44.Controls.Add(this.textBox3);
this.panel44.Controls.Add(this.label24);
- this.panel44.Location = new System.Drawing.Point(330, 318);
- this.panel44.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel44.Location = new System.Drawing.Point(360, 364);
+ this.panel44.Margin = new System.Windows.Forms.Padding(5);
this.panel44.Name = "panel44";
- this.panel44.Size = new System.Drawing.Size(1280, 132);
+ this.panel44.Size = new System.Drawing.Size(1397, 150);
this.panel44.TabIndex = 1;
//
// button2
//
this.button2.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button2.Location = new System.Drawing.Point(1098, 38);
- this.button2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.button2.Location = new System.Drawing.Point(1197, 44);
+ this.button2.Margin = new System.Windows.Forms.Padding(5);
this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(147, 52);
+ this.button2.Size = new System.Drawing.Size(160, 60);
this.button2.TabIndex = 3;
this.button2.Text = "取消";
this.button2.UseVisualStyleBackColor = true;
@@ -636,10 +686,10 @@
// button1
//
this.button1.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button1.Location = new System.Drawing.Point(941, 46);
- this.button1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.button1.Location = new System.Drawing.Point(1027, 40);
+ this.button1.Margin = new System.Windows.Forms.Padding(5);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(147, 52);
+ this.button1.Size = new System.Drawing.Size(160, 60);
this.button1.TabIndex = 2;
this.button1.Text = "确定";
this.button1.UseVisualStyleBackColor = true;
@@ -648,20 +698,20 @@
// textBox3
//
this.textBox3.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox3.Location = new System.Drawing.Point(191, 38);
- this.textBox3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.textBox3.Location = new System.Drawing.Point(208, 44);
+ this.textBox3.Margin = new System.Windows.Forms.Padding(5);
this.textBox3.Name = "textBox3";
- this.textBox3.Size = new System.Drawing.Size(677, 49);
+ this.textBox3.Size = new System.Drawing.Size(737, 55);
this.textBox3.TabIndex = 1;
//
// label24
//
this.label24.AutoSize = true;
this.label24.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label24.Location = new System.Drawing.Point(24, 46);
- this.label24.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label24.Location = new System.Drawing.Point(27, 52);
+ this.label24.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label24.Name = "label24";
- this.label24.Size = new System.Drawing.Size(169, 37);
+ this.label24.Size = new System.Drawing.Size(190, 42);
this.label24.TabIndex = 0;
this.label24.Text = "箱单号：";
this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -729,17 +779,17 @@
this.glacialList1.HoverEvents = false;
this.glacialList1.HoverTime = 1;
this.glacialList1.ImageList = null;
- this.glacialList1.ItemHeight = 50;
+ this.glacialList1.ItemHeight = 57;
this.glacialList1.ItemWordWrap = false;
this.glacialList1.Location = new System.Drawing.Point(0, 0);
- this.glacialList1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.glacialList1.Margin = new System.Windows.Forms.Padding(5);
this.glacialList1.Name = "glacialList1";
this.glacialList1.Selectable = true;
this.glacialList1.SelectedTextColor = System.Drawing.Color.White;
this.glacialList1.SelectionColor = System.Drawing.Color.DarkBlue;
this.glacialList1.ShowBorder = true;
this.glacialList1.ShowFocusRect = false;
- this.glacialList1.Size = new System.Drawing.Size(2037, 975);
+ this.glacialList1.Size = new System.Drawing.Size(2221, 1115);
this.glacialList1.SortType = GlacialComponents.Controls.SortTypes.InsertionSort;
this.glacialList1.SuperFlatHeaderColor = System.Drawing.Color.White;
this.glacialList1.TabIndex = 0;
@@ -748,15 +798,31 @@
//
// panel25
//
- this.panel25.Controls.Add(this.panel38);
+ this.panel25.Controls.Add(this.tableLayoutPanel2);
this.panel25.Controls.Add(this.panel36);
this.panel25.Dock = System.Windows.Forms.DockStyle.Left;
this.panel25.Location = new System.Drawing.Point(0, 0);
- this.panel25.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel25.Margin = new System.Windows.Forms.Padding(5);
this.panel25.Name = "panel25";
- this.panel25.Size = new System.Drawing.Size(310, 975);
+ this.panel25.Size = new System.Drawing.Size(339, 1115);
this.panel25.TabIndex = 0;
//
+ // tableLayoutPanel2
+ //
+ this.tableLayoutPanel2.ColumnCount = 1;
+ this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+ this.tableLayoutPanel2.Controls.Add(this.panel38, 0, 0);
+ this.tableLayoutPanel2.Controls.Add(this.groupBox1, 0, 1);
+ this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 464);
+ this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4);
+ this.tableLayoutPanel2.Name = "tableLayoutPanel2";
+ this.tableLayoutPanel2.RowCount = 2;
+ this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 300F));
+ this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+ this.tableLayoutPanel2.Size = new System.Drawing.Size(339, 651);
+ this.tableLayoutPanel2.TabIndex = 1;
+ //
// panel38
//
this.panel38.BackColor = System.Drawing.Color.DeepSkyBlue;
@@ -764,20 +830,19 @@
this.panel38.Controls.Add(this.label26);
this.panel38.Controls.Add(this.label17);
this.panel38.Controls.Add(this.label16);
- this.panel38.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel38.Location = new System.Drawing.Point(0, 406);
- this.panel38.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel38.Location = new System.Drawing.Point(5, 5);
+ this.panel38.Margin = new System.Windows.Forms.Padding(5);
this.panel38.Name = "panel38";
- this.panel38.Size = new System.Drawing.Size(310, 569);
+ this.panel38.Size = new System.Drawing.Size(317, 288);
this.panel38.TabIndex = 1;
//
// label27
//
this.label27.Font = new System.Drawing.Font("宋体", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label27.Location = new System.Drawing.Point(2, 401);
- this.label27.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label27.Location = new System.Drawing.Point(-3, 195);
+ this.label27.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label27.Name = "label27";
- this.label27.Size = new System.Drawing.Size(306, 136);
+ this.label27.Size = new System.Drawing.Size(317, 83);
this.label27.TabIndex = 3;
this.label27.Text = "9999";
this.label27.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -785,20 +850,21 @@
// label26
//
this.label26.AutoSize = true;
- this.label26.Location = new System.Drawing.Point(22, 327);
- this.label26.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label26.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label26.Location = new System.Drawing.Point(0, 156);
+ this.label26.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label26.Name = "label26";
- this.label26.Size = new System.Drawing.Size(230, 51);
+ this.label26.Size = new System.Drawing.Size(169, 37);
this.label26.TabIndex = 2;
this.label26.Text = "完成数量";
//
// label17
//
this.label17.Font = new System.Drawing.Font("宋体", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label17.Location = new System.Drawing.Point(2, 119);
- this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label17.Location = new System.Drawing.Point(-3, 56);
+ this.label17.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(306, 136);
+ this.label17.Size = new System.Drawing.Size(317, 84);
this.label17.TabIndex = 1;
this.label17.Text = "9999";
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -806,45 +872,337 @@
// label16
//
this.label16.AutoSize = true;
- this.label16.Location = new System.Drawing.Point(22, 46);
- this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label16.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label16.Location = new System.Drawing.Point(0, 11);
+ this.label16.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label16.Name = "label16";
- this.label16.Size = new System.Drawing.Size(230, 51);
+ this.label16.Size = new System.Drawing.Size(169, 37);
this.label16.TabIndex = 0;
this.label16.Text = "计划数量";
//
+ // groupBox1
+ //
+ this.groupBox1.BackColor = System.Drawing.Color.Aquamarine;
+ this.groupBox1.Controls.Add(this.tableLayoutPanel3);
+ this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.groupBox1.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.groupBox1.Location = new System.Drawing.Point(4, 304);
+ this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Padding = new System.Windows.Forms.Padding(4);
+ this.groupBox1.Size = new System.Drawing.Size(331, 343);
+ this.groupBox1.TabIndex = 2;
+ this.groupBox1.TabStop = false;
+ this.groupBox1.Text = "模具2";
+ //
+ // tableLayoutPanel3
+ //
+ this.tableLayoutPanel3.ColumnCount = 2;
+ this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 40F));
+ this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 60F));
+ this.tableLayoutPanel3.Controls.Add(this.comBoxSizeR, 1, 1);
+ this.tableLayoutPanel3.Controls.Add(this.panel47, 0, 2);
+ this.tableLayoutPanel3.Controls.Add(this.label34, 0, 1);
+ this.tableLayoutPanel3.Controls.Add(this.lbPackageCodeR, 0, 0);
+ this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tableLayoutPanel3.Location = new System.Drawing.Point(4, 36);
+ this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(4);
+ this.tableLayoutPanel3.Name = "tableLayoutPanel3";
+ this.tableLayoutPanel3.RowCount = 3;
+ this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33111F));
+ this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F));
+ this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F));
+ this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+ this.tableLayoutPanel3.Size = new System.Drawing.Size(323, 303);
+ this.tableLayoutPanel3.TabIndex = 2;
+ //
+ // comBoxSizeR
+ //
+ this.comBoxSizeR.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.comBoxSizeR.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.comBoxSizeR.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.comBoxSizeR.FormattingEnabled = true;
+ this.comBoxSizeR.Items.AddRange(new object[] {
+ "A班",
+ "B班"});
+ this.comBoxSizeR.Location = new System.Drawing.Point(134, 114);
+ this.comBoxSizeR.Margin = new System.Windows.Forms.Padding(5);
+ this.comBoxSizeR.Name = "comBoxSizeR";
+ this.comBoxSizeR.Size = new System.Drawing.Size(177, 72);
+ this.comBoxSizeR.TabIndex = 3;
+ this.comBoxSizeR.SelectedValueChanged += new System.EventHandler(this.comBoxSizeR_SelectedValueChanged);
+ //
+ // panel47
+ //
+ this.tableLayoutPanel3.SetColumnSpan(this.panel47, 2);
+ this.panel47.Controls.Add(this.btnHandPrintR);
+ this.panel47.Controls.Add(this.label30);
+ this.panel47.Controls.Add(this.lbNeedQtyR);
+ this.panel47.Controls.Add(this.lbCurrentlQtyR);
+ this.panel47.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.panel47.Location = new System.Drawing.Point(4, 205);
+ this.panel47.Margin = new System.Windows.Forms.Padding(4);
+ this.panel47.Name = "panel47";
+ this.panel47.Size = new System.Drawing.Size(315, 94);
+ this.panel47.TabIndex = 4;
+ //
+ // btnHandPrintR
+ //
+ this.btnHandPrintR.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnHandPrintR.Location = new System.Drawing.Point(200, 29);
+ this.btnHandPrintR.Margin = new System.Windows.Forms.Padding(4);
+ this.btnHandPrintR.Name = "btnHandPrintR";
+ this.btnHandPrintR.Size = new System.Drawing.Size(125, 60);
+ this.btnHandPrintR.TabIndex = 3;
+ this.btnHandPrintR.Text = "打印";
+ this.btnHandPrintR.UseVisualStyleBackColor = true;
+ this.btnHandPrintR.Click += new System.EventHandler(this.btnHandPrintR_Click);
+ //
+ // label30
+ //
+ this.label30.AutoSize = true;
+ this.label30.Font = new System.Drawing.Font("宋体", 22.125F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label30.Location = new System.Drawing.Point(77, 29);
+ this.label30.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label30.Name = "label30";
+ this.label30.Size = new System.Drawing.Size(56, 59);
+ this.label30.TabIndex = 2;
+ this.label30.Text = "/";
+ //
+ // lbNeedQtyR
+ //
+ this.lbNeedQtyR.AutoSize = true;
+ this.lbNeedQtyR.Font = new System.Drawing.Font("宋体", 22.125F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbNeedQtyR.Location = new System.Drawing.Point(140, 32);
+ this.lbNeedQtyR.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbNeedQtyR.Name = "lbNeedQtyR";
+ this.lbNeedQtyR.Size = new System.Drawing.Size(56, 59);
+ this.lbNeedQtyR.TabIndex = 1;
+ this.lbNeedQtyR.Text = "0";
+ //
+ // lbCurrentlQtyR
+ //
+ this.lbCurrentlQtyR.AutoSize = true;
+ this.lbCurrentlQtyR.Font = new System.Drawing.Font("宋体", 22.125F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbCurrentlQtyR.Location = new System.Drawing.Point(19, 32);
+ this.lbCurrentlQtyR.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbCurrentlQtyR.Name = "lbCurrentlQtyR";
+ this.lbCurrentlQtyR.Size = new System.Drawing.Size(56, 59);
+ this.lbCurrentlQtyR.TabIndex = 0;
+ this.lbCurrentlQtyR.Text = "0";
+ this.lbCurrentlQtyR.Click += new System.EventHandler(this.lbCurrentlQty_Click);
+ //
+ // label34
+ //
+ this.label34.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.label34.BackColor = System.Drawing.Color.Transparent;
+ this.label34.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label34.Location = new System.Drawing.Point(5, 124);
+ this.label34.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label34.Name = "label34";
+ this.label34.Size = new System.Drawing.Size(116, 53);
+ this.label34.TabIndex = 1;
+ this.label34.Text = "规格:";
+ this.label34.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // lbPackageCodeR
+ //
+ this.lbPackageCodeR.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.lbPackageCodeR.AutoSize = true;
+ this.tableLayoutPanel3.SetColumnSpan(this.lbPackageCodeR, 2);
+ this.lbPackageCodeR.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbPackageCodeR.Location = new System.Drawing.Point(4, 31);
+ this.lbPackageCodeR.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbPackageCodeR.Name = "lbPackageCodeR";
+ this.lbPackageCodeR.Size = new System.Drawing.Size(0, 37);
+ this.lbPackageCodeR.TabIndex = 5;
+ //
// panel36
//
- this.panel36.Controls.Add(this.label11);
+ this.panel36.Controls.Add(this.tableLayoutPanel1);
this.panel36.Dock = System.Windows.Forms.DockStyle.Top;
this.panel36.Location = new System.Drawing.Point(0, 0);
- this.panel36.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel36.Margin = new System.Windows.Forms.Padding(5);
this.panel36.Name = "panel36";
- this.panel36.Size = new System.Drawing.Size(310, 406);
+ this.panel36.Size = new System.Drawing.Size(339, 464);
this.panel36.TabIndex = 0;
//
+ // tableLayoutPanel1
+ //
+ this.tableLayoutPanel1.ColumnCount = 1;
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+ this.tableLayoutPanel1.Controls.Add(this.label11, 0, 0);
+ this.tableLayoutPanel1.Controls.Add(this.groupBox2, 0, 1);
+ this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
+ this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4);
+ this.tableLayoutPanel1.Name = "tableLayoutPanel1";
+ this.tableLayoutPanel1.RowCount = 2;
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25.00047F));
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 74.99953F));
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(339, 464);
+ this.tableLayoutPanel1.TabIndex = 1;
+ //
// label11
//
+ this.label11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.label11.BackColor = System.Drawing.Color.DeepSkyBlue;
this.label11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.label11.Dock = System.Windows.Forms.DockStyle.Fill;
- this.label11.Location = new System.Drawing.Point(0, 0);
- this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label11.Location = new System.Drawing.Point(5, 21);
+ this.label11.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(310, 406);
+ this.label11.Size = new System.Drawing.Size(325, 95);
this.label11.TabIndex = 0;
this.label11.Text = "打印记录：";
this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
+ // groupBox2
+ //
+ this.groupBox2.BackColor = System.Drawing.Color.Aquamarine;
+ this.groupBox2.Controls.Add(this.tableLayoutPanel4);
+ this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.groupBox2.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Bold);
+ this.groupBox2.Location = new System.Drawing.Point(4, 120);
+ this.groupBox2.Margin = new System.Windows.Forms.Padding(4);
+ this.groupBox2.Name = "groupBox2";
+ this.groupBox2.Padding = new System.Windows.Forms.Padding(4);
+ this.groupBox2.Size = new System.Drawing.Size(331, 340);
+ this.groupBox2.TabIndex = 1;
+ this.groupBox2.TabStop = false;
+ this.groupBox2.Text = "模具1&&手打";
+ //
+ // tableLayoutPanel4
+ //
+ this.tableLayoutPanel4.ColumnCount = 2;
+ this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 40F));
+ this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 60F));
+ this.tableLayoutPanel4.Controls.Add(this.comBoxSizeL, 1, 1);
+ this.tableLayoutPanel4.Controls.Add(this.label38, 0, 1);
+ this.tableLayoutPanel4.Controls.Add(this.panel46, 0, 2);
+ this.tableLayoutPanel4.Controls.Add(this.lbPackageCodeL, 0, 0);
+ this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 36);
+ this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4);
+ this.tableLayoutPanel4.Name = "tableLayoutPanel4";
+ this.tableLayoutPanel4.RowCount = 3;
+ this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33111F));
+ this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F));
+ this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F));
+ this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+ this.tableLayoutPanel4.Size = new System.Drawing.Size(323, 300);
+ this.tableLayoutPanel4.TabIndex = 3;
+ //
+ // comBoxSizeL
+ //
+ this.comBoxSizeL.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.comBoxSizeL.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.comBoxSizeL.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.comBoxSizeL.FormattingEnabled = true;
+ this.comBoxSizeL.Items.AddRange(new object[] {
+ "A班",
+ "B班"});
+ this.comBoxSizeL.Location = new System.Drawing.Point(134, 113);
+ this.comBoxSizeL.Margin = new System.Windows.Forms.Padding(5);
+ this.comBoxSizeL.Name = "comBoxSizeL";
+ this.comBoxSizeL.Size = new System.Drawing.Size(177, 72);
+ this.comBoxSizeL.TabIndex = 3;
+ this.comBoxSizeL.SelectedValueChanged += new System.EventHandler(this.comBoxSize_SelectedValueChanged);
+ //
+ // label38
+ //
+ this.label38.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.label38.BackColor = System.Drawing.Color.Transparent;
+ this.label38.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label38.Location = new System.Drawing.Point(5, 122);
+ this.label38.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label38.Name = "label38";
+ this.label38.Size = new System.Drawing.Size(116, 53);
+ this.label38.TabIndex = 1;
+ this.label38.Text = "规格:";
+ this.label38.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // panel46
+ //
+ this.tableLayoutPanel4.SetColumnSpan(this.panel46, 2);
+ this.panel46.Controls.Add(this.btnHandPrintL);
+ this.panel46.Controls.Add(this.label31);
+ this.panel46.Controls.Add(this.lbNeedQtyL);
+ this.panel46.Controls.Add(this.lbCurrentlQtyL);
+ this.panel46.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.panel46.Location = new System.Drawing.Point(4, 203);
+ this.panel46.Margin = new System.Windows.Forms.Padding(4);
+ this.panel46.Name = "panel46";
+ this.panel46.Size = new System.Drawing.Size(315, 93);
+ this.panel46.TabIndex = 4;
+ //
+ // btnHandPrintL
+ //
+ this.btnHandPrintL.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnHandPrintL.Location = new System.Drawing.Point(200, 29);
+ this.btnHandPrintL.Margin = new System.Windows.Forms.Padding(4);
+ this.btnHandPrintL.Name = "btnHandPrintL";
+ this.btnHandPrintL.Size = new System.Drawing.Size(125, 60);
+ this.btnHandPrintL.TabIndex = 3;
+ this.btnHandPrintL.Text = "打印";
+ this.btnHandPrintL.UseVisualStyleBackColor = true;
+ this.btnHandPrintL.Click += new System.EventHandler(this.btnHandPrintL_Click);
+ //
+ // label31
+ //
+ this.label31.AutoSize = true;
+ this.label31.Font = new System.Drawing.Font("宋体", 22.125F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label31.Location = new System.Drawing.Point(77, 29);
+ this.label31.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label31.Name = "label31";
+ this.label31.Size = new System.Drawing.Size(56, 59);
+ this.label31.TabIndex = 2;
+ this.label31.Text = "/";
+ //
+ // lbNeedQtyL
+ //
+ this.lbNeedQtyL.AutoSize = true;
+ this.lbNeedQtyL.Font = new System.Drawing.Font("宋体", 22.125F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbNeedQtyL.Location = new System.Drawing.Point(140, 32);
+ this.lbNeedQtyL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbNeedQtyL.Name = "lbNeedQtyL";
+ this.lbNeedQtyL.Size = new System.Drawing.Size(56, 59);
+ this.lbNeedQtyL.TabIndex = 1;
+ this.lbNeedQtyL.Text = "0";
+ //
+ // lbCurrentlQtyL
+ //
+ this.lbCurrentlQtyL.AutoSize = true;
+ this.lbCurrentlQtyL.Font = new System.Drawing.Font("宋体", 22.125F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbCurrentlQtyL.Location = new System.Drawing.Point(19, 32);
+ this.lbCurrentlQtyL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbCurrentlQtyL.Name = "lbCurrentlQtyL";
+ this.lbCurrentlQtyL.Size = new System.Drawing.Size(56, 59);
+ this.lbCurrentlQtyL.TabIndex = 0;
+ this.lbCurrentlQtyL.Text = "0";
+ this.lbCurrentlQtyL.Click += new System.EventHandler(this.lbCurrentlQty_Click);
+ //
+ // lbPackageCodeL
+ //
+ this.lbPackageCodeL.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.lbPackageCodeL.AutoSize = true;
+ this.tableLayoutPanel4.SetColumnSpan(this.lbPackageCodeL, 2);
+ this.lbPackageCodeL.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbPackageCodeL.Location = new System.Drawing.Point(4, 31);
+ this.lbPackageCodeL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbPackageCodeL.Name = "lbPackageCodeL";
+ this.lbPackageCodeL.Size = new System.Drawing.Size(0, 37);
+ this.lbPackageCodeL.TabIndex = 5;
+ //
// panel8
//
this.panel8.Controls.Add(this.panel10);
this.panel8.Controls.Add(this.panel9);
this.panel8.Dock = System.Windows.Forms.DockStyle.Top;
this.panel8.Location = new System.Drawing.Point(0, 0);
- this.panel8.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel8.Margin = new System.Windows.Forms.Padding(5);
this.panel8.Name = "panel8";
- this.panel8.Size = new System.Drawing.Size(2347, 91);
+ this.panel8.Size = new System.Drawing.Size(2560, 104);
this.panel8.TabIndex = 0;
//
// panel10
@@ -852,21 +1210,21 @@
this.panel10.Controls.Add(this.panel12);
this.panel10.Controls.Add(this.panel11);
this.panel10.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel10.Location = new System.Drawing.Point(310, 0);
- this.panel10.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel10.Location = new System.Drawing.Point(339, 0);
+ this.panel10.Margin = new System.Windows.Forms.Padding(5);
this.panel10.Name = "panel10";
- this.panel10.Size = new System.Drawing.Size(2037, 91);
- this.panel10.TabIndex = 1;
+ this.panel10.Size = new System.Drawing.Size(2221, 104);
+ this.panel10.TabIndex = 2;
//
// panel12
//
this.panel12.Controls.Add(this.panel16);
this.panel12.Controls.Add(this.panel15);
this.panel12.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel12.Location = new System.Drawing.Point(451, 0);
- this.panel12.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel12.Location = new System.Drawing.Point(492, 0);
+ this.panel12.Margin = new System.Windows.Forms.Padding(5);
this.panel12.Name = "panel12";
- this.panel12.Size = new System.Drawing.Size(1586, 91);
+ this.panel12.Size = new System.Drawing.Size(1729, 104);
this.panel12.TabIndex = 1;
//
// panel16
@@ -874,10 +1232,10 @@
this.panel16.Controls.Add(this.panel20);
this.panel16.Controls.Add(this.panel19);
this.panel16.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel16.Location = new System.Drawing.Point(468, 0);
- this.panel16.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel16.Location = new System.Drawing.Point(509, 0);
+ this.panel16.Margin = new System.Windows.Forms.Padding(5);
this.panel16.Name = "panel16";
- this.panel16.Size = new System.Drawing.Size(1118, 91);
+ this.panel16.Size = new System.Drawing.Size(1220, 104);
this.panel16.TabIndex = 1;
//
// panel20
@@ -885,10 +1243,10 @@
this.panel20.Controls.Add(this.label10);
this.panel20.Controls.Add(this.panel22);
this.panel20.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel20.Location = new System.Drawing.Point(427, 0);
- this.panel20.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel20.Location = new System.Drawing.Point(467, 0);
+ this.panel20.Margin = new System.Windows.Forms.Padding(5);
this.panel20.Name = "panel20";
- this.panel20.Size = new System.Drawing.Size(691, 91);
+ this.panel20.Size = new System.Drawing.Size(753, 104);
this.panel20.TabIndex = 1;
//
// label10
@@ -896,10 +1254,10 @@
this.label10.BackColor = System.Drawing.Color.DeepSkyBlue;
this.label10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label10.Dock = System.Windows.Forms.DockStyle.Fill;
- this.label10.Location = new System.Drawing.Point(341, 0);
- this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label10.Location = new System.Drawing.Point(372, 0);
+ this.label10.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(350, 91);
+ this.label10.Size = new System.Drawing.Size(381, 104);
this.label10.TabIndex = 1;
this.label10.Text = "停机录入";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -910,9 +1268,9 @@
this.panel22.Controls.Add(this.label9);
this.panel22.Dock = System.Windows.Forms.DockStyle.Left;
this.panel22.Location = new System.Drawing.Point(0, 0);
- this.panel22.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel22.Margin = new System.Windows.Forms.Padding(5);
this.panel22.Name = "panel22";
- this.panel22.Size = new System.Drawing.Size(341, 91);
+ this.panel22.Size = new System.Drawing.Size(372, 104);
this.panel22.TabIndex = 0;
//
// label9
@@ -922,9 +1280,9 @@
this.label9.Dock = System.Windows.Forms.DockStyle.Fill;
this.label9.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
this.label9.Location = new System.Drawing.Point(0, 0);
- this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label9.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(341, 91);
+ this.label9.Size = new System.Drawing.Size(372, 104);
this.label9.TabIndex = 0;
this.label9.Text = "质量录入";
this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -936,9 +1294,9 @@
this.panel19.Controls.Add(this.panel21);
this.panel19.Dock = System.Windows.Forms.DockStyle.Left;
this.panel19.Location = new System.Drawing.Point(0, 0);
- this.panel19.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel19.Margin = new System.Windows.Forms.Padding(5);
this.panel19.Name = "panel19";
- this.panel19.Size = new System.Drawing.Size(427, 91);
+ this.panel19.Size = new System.Drawing.Size(467, 104);
this.panel19.TabIndex = 0;
//
// label8
@@ -946,10 +1304,10 @@
this.label8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label8.Dock = System.Windows.Forms.DockStyle.Fill;
this.label8.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
- this.label8.Location = new System.Drawing.Point(202, 0);
- this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label8.Location = new System.Drawing.Point(220, 0);
+ this.label8.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(225, 91);
+ this.label8.Size = new System.Drawing.Size(247, 104);
this.label8.TabIndex = 1;
this.label8.Text = "cy";
this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -959,9 +1317,9 @@
this.panel21.Controls.Add(this.label7);
this.panel21.Dock = System.Windows.Forms.DockStyle.Left;
this.panel21.Location = new System.Drawing.Point(0, 0);
- this.panel21.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel21.Margin = new System.Windows.Forms.Padding(5);
this.panel21.Name = "panel21";
- this.panel21.Size = new System.Drawing.Size(202, 91);
+ this.panel21.Size = new System.Drawing.Size(220, 104);
this.panel21.TabIndex = 0;
//
// label7
@@ -971,9 +1329,9 @@
this.label7.Dock = System.Windows.Forms.DockStyle.Fill;
this.label7.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
this.label7.Location = new System.Drawing.Point(0, 0);
- this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label7.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(202, 91);
+ this.label7.Size = new System.Drawing.Size(220, 104);
this.label7.TabIndex = 0;
this.label7.Text = "用户：";
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -985,19 +1343,19 @@
this.panel15.Controls.Add(this.panel17);
this.panel15.Dock = System.Windows.Forms.DockStyle.Left;
this.panel15.Location = new System.Drawing.Point(0, 0);
- this.panel15.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel15.Margin = new System.Windows.Forms.Padding(5);
this.panel15.Name = "panel15";
- this.panel15.Size = new System.Drawing.Size(468, 91);
+ this.panel15.Size = new System.Drawing.Size(509, 104);
this.panel15.TabIndex = 0;
//
// panel18
//
this.panel18.Controls.Add(this.label6);
this.panel18.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel18.Location = new System.Drawing.Point(202, 0);
- this.panel18.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel18.Location = new System.Drawing.Point(220, 0);
+ this.panel18.Margin = new System.Windows.Forms.Padding(5);
this.panel18.Name = "panel18";
- this.panel18.Size = new System.Drawing.Size(266, 91);
+ this.panel18.Size = new System.Drawing.Size(289, 104);
this.panel18.TabIndex = 1;
//
// label6
@@ -1006,9 +1364,9 @@
this.label6.Dock = System.Windows.Forms.DockStyle.Fill;
this.label6.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
this.label6.Location = new System.Drawing.Point(0, 0);
- this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label6.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(266, 91);
+ this.label6.Size = new System.Drawing.Size(289, 104);
this.label6.TabIndex = 0;
this.label6.Text = "IM01";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1018,9 +1376,9 @@
this.panel17.Controls.Add(this.label5);
this.panel17.Dock = System.Windows.Forms.DockStyle.Left;
this.panel17.Location = new System.Drawing.Point(0, 0);
- this.panel17.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel17.Margin = new System.Windows.Forms.Padding(5);
this.panel17.Name = "panel17";
- this.panel17.Size = new System.Drawing.Size(202, 91);
+ this.panel17.Size = new System.Drawing.Size(220, 104);
this.panel17.TabIndex = 0;
//
// label5
@@ -1030,9 +1388,9 @@
this.label5.Dock = System.Windows.Forms.DockStyle.Fill;
this.label5.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
this.label5.Location = new System.Drawing.Point(0, 0);
- this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(202, 91);
+ this.label5.Size = new System.Drawing.Size(220, 104);
this.label5.TabIndex = 0;
this.label5.Text = "工位：";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1044,19 +1402,19 @@
this.panel11.Controls.Add(this.panel13);
this.panel11.Dock = System.Windows.Forms.DockStyle.Left;
this.panel11.Location = new System.Drawing.Point(0, 0);
- this.panel11.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel11.Margin = new System.Windows.Forms.Padding(5);
this.panel11.Name = "panel11";
- this.panel11.Size = new System.Drawing.Size(451, 91);
+ this.panel11.Size = new System.Drawing.Size(492, 104);
this.panel11.TabIndex = 0;
//
// panel14
//
this.panel14.Controls.Add(this.comboBox1);
this.panel14.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel14.Location = new System.Drawing.Point(202, 0);
- this.panel14.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel14.Location = new System.Drawing.Point(220, 0);
+ this.panel14.Margin = new System.Windows.Forms.Padding(5);
this.panel14.Name = "panel14";
- this.panel14.Size = new System.Drawing.Size(249, 91);
+ this.panel14.Size = new System.Drawing.Size(272, 104);
this.panel14.TabIndex = 1;
//
// comboBox1
@@ -1069,20 +1427,19 @@
"A班",
"B班"});
this.comboBox1.Location = new System.Drawing.Point(0, 0);
- this.comboBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.comboBox1.Margin = new System.Windows.Forms.Padding(5);
this.comboBox1.Name = "comboBox1";
- this.comboBox1.Size = new System.Drawing.Size(249, 83);
+ this.comboBox1.Size = new System.Drawing.Size(272, 93);
this.comboBox1.TabIndex = 0;
- this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
//
// panel13
//
this.panel13.Controls.Add(this.label4);
this.panel13.Dock = System.Windows.Forms.DockStyle.Left;
this.panel13.Location = new System.Drawing.Point(0, 0);
- this.panel13.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel13.Margin = new System.Windows.Forms.Padding(5);
this.panel13.Name = "panel13";
- this.panel13.Size = new System.Drawing.Size(202, 91);
+ this.panel13.Size = new System.Drawing.Size(220, 104);
this.panel13.TabIndex = 0;
//
// label4
@@ -1092,9 +1449,9 @@
this.label4.Dock = System.Windows.Forms.DockStyle.Fill;
this.label4.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
this.label4.Location = new System.Drawing.Point(0, 0);
- this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(202, 91);
+ this.label4.Size = new System.Drawing.Size(220, 104);
this.label4.TabIndex = 0;
this.label4.Text = "班组：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1104,9 +1461,9 @@
this.panel9.Controls.Add(this.label3);
this.panel9.Dock = System.Windows.Forms.DockStyle.Left;
this.panel9.Location = new System.Drawing.Point(0, 0);
- this.panel9.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel9.Margin = new System.Windows.Forms.Padding(5);
this.panel9.Name = "panel9";
- this.panel9.Size = new System.Drawing.Size(310, 91);
+ this.panel9.Size = new System.Drawing.Size(339, 104);
this.panel9.TabIndex = 0;
//
// label3
@@ -1116,9 +1473,9 @@
this.label3.Dock = System.Windows.Forms.DockStyle.Fill;
this.label3.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
this.label3.Location = new System.Drawing.Point(0, 0);
- this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(310, 91);
+ this.label3.Size = new System.Drawing.Size(339, 104);
this.label3.TabIndex = 0;
this.label3.Text = "用户信息：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1129,9 +1486,9 @@
this.panel2.Controls.Add(this.panel3);
this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
this.panel2.Location = new System.Drawing.Point(0, 0);
- this.panel2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel2.Margin = new System.Windows.Forms.Padding(5);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(2347, 147);
+ this.panel2.Size = new System.Drawing.Size(2560, 168);
this.panel2.TabIndex = 0;
//
// panel4
@@ -1139,10 +1496,10 @@
this.panel4.Controls.Add(this.panel6);
this.panel4.Controls.Add(this.panel5);
this.panel4.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel4.Location = new System.Drawing.Point(310, 0);
- this.panel4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel4.Location = new System.Drawing.Point(339, 0);
+ this.panel4.Margin = new System.Windows.Forms.Padding(5);
this.panel4.Name = "panel4";
- this.panel4.Size = new System.Drawing.Size(2037, 147);
+ this.panel4.Size = new System.Drawing.Size(2221, 168);
this.panel4.TabIndex = 1;
//
// panel6
@@ -1150,9 +1507,9 @@
this.panel6.Controls.Add(this.label1);
this.panel6.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel6.Location = new System.Drawing.Point(0, 0);
- this.panel6.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel6.Margin = new System.Windows.Forms.Padding(5);
this.panel6.Name = "panel6";
- this.panel6.Size = new System.Drawing.Size(1685, 147);
+ this.panel6.Size = new System.Drawing.Size(1837, 168);
this.panel6.TabIndex = 1;
//
// label1
@@ -1161,9 +1518,9 @@
this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
this.label1.Font = new System.Drawing.Font("宋体", 36F, System.Drawing.FontStyle.Bold);
this.label1.Location = new System.Drawing.Point(0, 0);
- this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(1685, 147);
+ this.label1.Size = new System.Drawing.Size(1837, 168);
this.label1.TabIndex = 0;
this.label1.Text = "注塑车间条码打印";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1172,10 +1529,10 @@
//
this.panel5.Controls.Add(this.label2);
this.panel5.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel5.Location = new System.Drawing.Point(1685, 0);
- this.panel5.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel5.Location = new System.Drawing.Point(1837, 0);
+ this.panel5.Margin = new System.Windows.Forms.Padding(5);
this.panel5.Name = "panel5";
- this.panel5.Size = new System.Drawing.Size(352, 147);
+ this.panel5.Size = new System.Drawing.Size(384, 168);
this.panel5.TabIndex = 0;
//
// label2
@@ -1184,9 +1541,9 @@
this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
this.label2.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold);
this.label2.Location = new System.Drawing.Point(0, 0);
- this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(352, 147);
+ this.label2.Size = new System.Drawing.Size(384, 168);
this.label2.TabIndex = 0;
this.label2.Text = "2019-05-29 10:30:31";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1197,23 +1554,41 @@
this.panel3.Controls.Add(this.pictureBox1);
this.panel3.Dock = System.Windows.Forms.DockStyle.Left;
this.panel3.Location = new System.Drawing.Point(0, 0);
- this.panel3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel3.Margin = new System.Windows.Forms.Padding(5);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(310, 147);
+ this.panel3.Size = new System.Drawing.Size(339, 168);
this.panel3.TabIndex = 0;
//
// pictureBox1
//
this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
- this.pictureBox1.Location = new System.Drawing.Point(6, 5);
- this.pictureBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.pictureBox1.Location = new System.Drawing.Point(5, 5);
+ this.pictureBox1.Margin = new System.Windows.Forms.Padding(5);
this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(308, 140);
+ this.pictureBox1.Size = new System.Drawing.Size(335, 159);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox1.TabIndex = 0;
this.pictureBox1.TabStop = false;
//
+ // label35
+ //
+ this.label35.AutoSize = true;
+ this.label35.Font = new System.Drawing.Font("宋体", 16.125F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label35.Location = new System.Drawing.Point(3, 0);
+ this.label35.Name = "label35";
+ this.label35.Size = new System.Drawing.Size(0, 43);
+ this.label35.TabIndex = 5;
+ //
+ // label39
+ //
+ this.label39.AutoSize = true;
+ this.label39.Font = new System.Drawing.Font("宋体", 16.125F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label39.Location = new System.Drawing.Point(3, 0);
+ this.label39.Name = "label39";
+ this.label39.Size = new System.Drawing.Size(0, 43);
+ this.label39.TabIndex = 5;
+ //
// timer1
//
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
@@ -1235,12 +1610,12 @@
//
// FrmMain2408
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(2347, 1539);
+ this.ClientSize = new System.Drawing.Size(2560, 1651);
this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
- this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.Margin = new System.Windows.Forms.Padding(5);
this.Name = "FrmMain2408";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "FrmMain";
@@ -1271,9 +1646,21 @@
this.panel44.ResumeLayout(false);
this.panel44.PerformLayout();
this.panel25.ResumeLayout(false);
+ this.tableLayoutPanel2.ResumeLayout(false);
this.panel38.ResumeLayout(false);
this.panel38.PerformLayout();
+ this.groupBox1.ResumeLayout(false);
+ this.tableLayoutPanel3.ResumeLayout(false);
+ this.tableLayoutPanel3.PerformLayout();
+ this.panel47.ResumeLayout(false);
+ this.panel47.PerformLayout();
this.panel36.ResumeLayout(false);
+ this.tableLayoutPanel1.ResumeLayout(false);
+ this.groupBox2.ResumeLayout(false);
+ this.tableLayoutPanel4.ResumeLayout(false);
+ this.tableLayoutPanel4.PerformLayout();
+ this.panel46.ResumeLayout(false);
+ this.panel46.PerformLayout();
this.panel8.ResumeLayout(false);
this.panel10.ResumeLayout(false);
this.panel12.ResumeLayout(false);
@@ -1314,26 +1701,6 @@
private System.Windows.Forms.Panel panel8;
private System.Windows.Forms.Panel panel9;
private System.Windows.Forms.Label label3;
- private System.Windows.Forms.Panel panel10;
- private System.Windows.Forms.Panel panel11;
- private System.Windows.Forms.Panel panel12;
- private System.Windows.Forms.Panel panel13;
- private System.Windows.Forms.Panel panel14;
- private System.Windows.Forms.Label label4;
- private System.Windows.Forms.Panel panel15;
- private System.Windows.Forms.Panel panel16;
- private System.Windows.Forms.Panel panel18;
- private System.Windows.Forms.Panel panel17;
- private System.Windows.Forms.Label label5;
- private System.Windows.Forms.Label label6;
- private System.Windows.Forms.Panel panel19;
- private System.Windows.Forms.Panel panel20;
- private System.Windows.Forms.Panel panel21;
- private System.Windows.Forms.Label label7;
- private System.Windows.Forms.Panel panel22;
- private System.Windows.Forms.Label label8;
- private System.Windows.Forms.Label label9;
- private System.Windows.Forms.Label label10;
private System.Windows.Forms.Panel panel23;
private System.Windows.Forms.Panel panel24;
private System.Windows.Forms.Panel panel25;
@@ -1381,13 +1748,58 @@
private System.Windows.Forms.Label label25;
private System.IO.Ports.SerialPort serialPort1;
private System.Windows.Forms.Timer timer2;
+ private System.Windows.Forms.Panel panel36;
+ private System.Windows.Forms.Timer timer3;
+ public System.Windows.Forms.ComboBox comBoxSizeL;
+ private System.Windows.Forms.Panel panel10;
+ private System.Windows.Forms.Panel panel12;
+ private System.Windows.Forms.Panel panel16;
+ private System.Windows.Forms.Panel panel20;
+ private System.Windows.Forms.Label label10;
+ private System.Windows.Forms.Panel panel22;
+ private System.Windows.Forms.Label label9;
+ private System.Windows.Forms.Panel panel19;
+ private System.Windows.Forms.Label label8;
+ private System.Windows.Forms.Panel panel21;
+ private System.Windows.Forms.Label label7;
+ private System.Windows.Forms.Panel panel15;
+ private System.Windows.Forms.Panel panel18;
+ private System.Windows.Forms.Label label6;
+ private System.Windows.Forms.Panel panel17;
+ private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.Panel panel11;
+ private System.Windows.Forms.Panel panel14;
public System.Windows.Forms.ComboBox comboBox1;
+ private System.Windows.Forms.Panel panel13;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
+ private System.Windows.Forms.Panel panel46;
+ private System.Windows.Forms.Label label31;
+ private System.Windows.Forms.Label lbNeedQtyL;
+ private System.Windows.Forms.Label lbCurrentlQtyL;
+ private System.Windows.Forms.Button btnHandPrintL;
+ private System.Windows.Forms.CheckBox cboxHandBox;
+ private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
private System.Windows.Forms.Panel panel38;
private System.Windows.Forms.Label label27;
private System.Windows.Forms.Label label26;
private System.Windows.Forms.Label label17;
private System.Windows.Forms.Label label16;
- private System.Windows.Forms.Panel panel36;
- private System.Windows.Forms.Timer timer3;
+ private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3;
+ public System.Windows.Forms.ComboBox comBoxSizeR;
+ private System.Windows.Forms.Panel panel47;
+ private System.Windows.Forms.Button btnHandPrintR;
+ private System.Windows.Forms.Label label30;
+ private System.Windows.Forms.Label lbNeedQtyR;
+ private System.Windows.Forms.Label lbCurrentlQtyR;
+ private System.Windows.Forms.Label label34;
+ private System.Windows.Forms.Label label35;
+ private System.Windows.Forms.GroupBox groupBox2;
+ private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4;
+ private System.Windows.Forms.Label label38;
+ private System.Windows.Forms.Label label39;
+ private System.Windows.Forms.Label lbPackageCodeL;
+ private System.Windows.Forms.Label lbPackageCodeR;
}
}
\ No newline at end of file
diff --git a/InjectionPC/FrmMain2408.cs b/InjectionPC/FrmMain2408.cs
index 90b8dfb..5c1d88e 100644
--- a/InjectionPC/FrmMain2408.cs
+++ b/InjectionPC/FrmMain2408.cs
@@ -35,12 +35,6 @@ namespace InjectionPC
{
public partial class FrmMain2408 : Form
{
- private UniqueBll _uniqueBll = new UniqueBll();
- public FrmMain2408()
- {
- InitializeComponent();
- }
-
#region 变量
private string strHostIP;
@@ -58,9 +52,27 @@ namespace InjectionPC
object Qualities;
object TimeStamps;
public bool Connected = false;
-
+ private BasicBLL1 _basicBLL1 = new BasicBLL1();
+ private UniqueBll _uniqueBll = new UniqueBll();
+ private bool _isPrintPackage = true;
+ private BarCodeBLL _barCodeBLL = new BarCodeBLL();
+ private InjectionBoxBLL _injectionBoxBLL = new InjectionBoxBLL();
+ private DataTable tb_Plastic = new DataTable();
+ private string _currentStationID = string.Empty;
+ private const string _leftType = "0"; //模具1
+ private const string _rightType = "1";//模具2
+ private DateTime _loginTime = DateTime.Now;
+ private string _lastBoxNoL = string.Empty;
+ private string _lastBoxNoR = string.Empty;
+ private WmsBLL _wmsBll = new WmsBLL();
+ bool _isLoad = false;
#endregion
+ public FrmMain2408()
+ {
+ InitializeComponent();
+ }
+
public string planID = "", productID = "", nextPlanID = "", nextproductID = "",aa="";
public static int ID = 0;
@@ -75,6 +87,8 @@ namespace InjectionPC
{
try
{
+ _currentStationID = getStationID(Program.station);
+ tb_Plastic = GetPlastic();
Control.CheckForIllegalCrossThreadCalls = false;
//this.WindowState = FormWindowState.Maximized;
Thread t = new Thread(new ThreadStart(TimeGo));
@@ -98,6 +112,8 @@ namespace InjectionPC
label23.Enabled = false;
label23.BackColor = System.Drawing.Color.Gray;
+ InitPackageInfo();
+
Ping p1 = new Ping();
PingReply reply = p1.Send("10.60.101.60"); //发送主机名或Ip地址
@@ -113,6 +129,14 @@ namespace InjectionPC
label2.BackColor = Color.Red;
}
+ comBoxSizeL.DataSource = _basicBLL1.GetPackageSize();
+ comBoxSizeL.DisplayMember = "describe";
+ comBoxSizeL.ValueMember = "Count";
+ comBoxSizeR.DataSource = _basicBLL1.GetPackageSize();
+ comBoxSizeR.DisplayMember = "describe";
+ comBoxSizeR.ValueMember = "Count";
+
+
comboBox2.MouseWheel += new MouseEventHandler(comboBox2_MouseWheel);
#region 获取当前生产信息
@@ -212,15 +236,25 @@ namespace InjectionPC
}
#endregion
-
+
}
catch (Exception ex)
{
LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
}
+ finally
+ {
+ _isLoad = true;
+ }
}
+ private DataTable GetPlastic()
+ {
+ PlasticBLL bill = new PlasticBLL();
+ return bill.SearchAllInfo(_currentStationID);
+ }
+
private void initPlan()
{
try
@@ -271,6 +305,7 @@ namespace InjectionPC
{
label27.BackColor = Color.DeepSkyBlue;
}
+
}
catch (Exception ex)
{
@@ -292,6 +327,8 @@ namespace InjectionPC
{
try
{
+
+ CheckPackageSelect();
InjectionPlanBLL bll = new InjectionPlanBLL();
BarCodeBLL brbll = new BarCodeBLL();
BarCodeModel md = new BarCodeModel();
@@ -340,18 +377,21 @@ namespace InjectionPC
DataTable dt = bll.SearchInfoByName(Program.station);
if (dt != null && dt.Rows.Count > 0)
{
+
if (aa != dt.Rows[0]["PartNo"].ToString())
{
DialogResult result=MessageBox.Show("计划有变更，请确认！", "提示", MessageBoxButtons.OKCancel,
MessageBoxIcon.Information);
if (result == DialogResult.OK)
{
+
planID = dt.Rows[0]["InjectionPlanID"].ToString();
string[] partNo = dt.Rows[0]["PartNo"].ToString().Split(',');
//string[] stockNo = dt.Rows[0]["StockNo"].ToString().Split(',');
string[] stockNo = new string[partNo.Length];
string ProductNature = dt.Rows[0]["ProductNature"].ToString();
aa = dt.Rows[0]["PartNo"].ToString();
+
//ManufacturerName = dt.Rows[0]["ManufacturerName"].ToString();
DataTable dtM = productBll.SearchInfoByPartNo(partNo[0]);
if (dtM != null && dtM.Rows.Count > 0)
@@ -360,7 +400,7 @@ namespace InjectionPC
}
#region 判断有几个零件号
-
+ string mould = "0";
for (int j = 0; j < partNo.Length; j++)
{
#region 根据零件号查找存货代码
@@ -420,7 +460,7 @@ namespace InjectionPC
// Program.ProductDate.Substring(8, 2) + "." + "0001";
//}
- GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(),true, ref NewOneCode, ref newcode);
+ GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(),true, mould, PartName, ref NewOneCode, ref newcode);
}
else
{
@@ -453,7 +493,7 @@ namespace InjectionPC
// Program.ProductDate.Substring(8, 2) + "0001";
//}
- GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), true, ref NewOneCode, ref newcode);
+ GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), true, mould, PartName, ref NewOneCode, ref newcode);
}
}
@@ -481,7 +521,7 @@ namespace InjectionPC
// Program.ProductDate.Substring(8, 2) + "#" + "001"+"#";
//}
- GetSupplyCode(partNo[j].ToString().Trim(), QLevel, true, ref newcode);
+ GetSupplyCode(partNo[j].ToString().Trim(), QLevel, true, mould, PartName, ref newcode);
}
#endregion
@@ -511,12 +551,14 @@ namespace InjectionPC
// }
//}
- if (brbll.Add_Info_New(md, Program.tableName) == false)
- {
+ //if (brbll.Add_Info_New(md, Program.tableName) == false)
+ if (SaveBarCode (md, Program.tableName, true, mould) == false)
+ {
int a = 0;
for (int l = 0; l < 5; l++)
{
- if (brbll.Add_Info_New(md, Program.tableName))
+ // if (brbll.Add_Info_New(md, Program.tableName))
+ if (SaveBarCode(md, Program.tableName, true, mould) == false)
{
break;
}
@@ -621,7 +663,7 @@ namespace InjectionPC
// Program.ProductDate.Substring(8, 2) + "." + "0001";
//}
- GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), true, ref NewOneCode, ref newcode);
+ GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), true, mould, PartName, ref NewOneCode, ref newcode);
}
else
@@ -655,7 +697,7 @@ namespace InjectionPC
// Program.ProductDate.Substring(8, 2) + "0001";
//}
- GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), true, ref NewOneCode, ref newcode);
+ GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), true, mould, PartName, ref NewOneCode, ref newcode);
}
@@ -681,7 +723,7 @@ namespace InjectionPC
// Program.ProductDate.Substring(8, 2) + "#" + "001" + "#";
//}
- GetSupplyCode(partNo[j].ToString().Trim(), QLevel, true, ref newcode);
+ GetSupplyCode(partNo[j].ToString().Trim(), QLevel, true, mould, PartName, ref newcode);
#endregion
}
@@ -710,12 +752,14 @@ namespace InjectionPC
}
}
- if (brbll.Add_Info_New(md, Program.tableName) == false)
+ // if (brbll.Add_Info_New(md, Program.tableName) == false)
+ if (SaveBarCode(md, Program.tableName, true, mould) == false)
{
int a = 0;
for (int l = 0; l < 5; l++)
{
- if (brbll.Add_Info_New(md, Program.tableName))
+ //if (brbll.Add_Info_New(md, Program.tableName))
+ if (SaveBarCode(md, Program.tableName, true, mould) == false)
{
break;
}
@@ -835,11 +879,11 @@ namespace InjectionPC
}
#region 判断有几个零件号
-
+ string mould = "0";
for (int j = 0; j < partNo.Length; j++)
{
#region 根据零件号查找存货代码
-
+ mould = j.ToString();
DataTable sdt = productBll.SearchInfoByPartNo(partNo[j].ToString().Trim());
if (sdt != null && sdt.Rows.Count > 0)
{
@@ -902,7 +946,7 @@ namespace InjectionPC
#endregion
- GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), true, ref NewOneCode, ref newcode);
+ GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), true, mould, PartName, ref NewOneCode, ref newcode);
}
else
@@ -941,7 +985,7 @@ namespace InjectionPC
#endregion
- GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), true, ref NewOneCode, ref newcode);
+ GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), true, mould, PartName, ref NewOneCode, ref newcode);
}
}
@@ -977,7 +1021,7 @@ namespace InjectionPC
// Program.ProductDate.Substring(8, 2) + "#" + "001" + "#";
//}
- GetSupplyCode(partNo[j].ToString().Trim(), QLevel, true, ref newcode);
+ GetSupplyCode(partNo[j].ToString().Trim(), QLevel, true, mould, PartName, ref newcode);
}
catch (Exception ex)
{
@@ -1014,12 +1058,14 @@ namespace InjectionPC
}
}
- if (brbll.Add_Info_New(md, Program.tableName) == false)
- {
+ //if (brbll.Add_Info_New(md, Program.tableName) == false)
+ if (SaveBarCode(md, Program.tableName, true, mould) == false)
+ {
int a = 0;
for (int l = 0; l < 5; l++)
{
- if (brbll.Add_Info_New(md, Program.tableName))
+ //if (brbll.Add_Info_New(md, Program.tableName))
+ if (SaveBarCode(md, Program.tableName, true, mould) == false)
{
break;
}
@@ -1128,7 +1174,7 @@ namespace InjectionPC
#endregion
- GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), true, ref NewOneCode, ref newcode);
+ GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), true, mould, PartName, ref NewOneCode, ref newcode);
}
else
@@ -1166,7 +1212,7 @@ namespace InjectionPC
#endregion
- GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), true, ref NewOneCode, ref newcode);
+ GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), true, mould, PartName, ref NewOneCode, ref newcode);
}
}
@@ -1202,7 +1248,7 @@ namespace InjectionPC
// Program.ProductDate.Substring(8, 2) + "#" + "001" + "#";
//}
- GetSupplyCode(partNo[j].ToString().Trim(), QLevel, true, ref newcode);
+ GetSupplyCode(partNo[j].ToString().Trim(), QLevel, true, mould, PartName, ref newcode);
}
catch (Exception ex)
{
@@ -1239,13 +1285,15 @@ namespace InjectionPC
}
}
- if (brbll.Add_Info_New(md, Program.tableName) == false)
- {
+ //if (brbll.Add_Info_New(md, Program.tableName) == false)
+ if (SaveBarCode(md, Program.tableName, true, mould) == false)
+ {
int a = 0;
for (int l = 0; l < 5; l++)
{
- if (brbll.Add_Info_New(md, Program.tableName))
- {
+ //if (brbll.Add_Info_New(md, Program.tableName))
+ if (SaveBarCode(md, Program.tableName, true, mould) == false)
+ {
break;
}
@@ -1349,6 +1397,8 @@ namespace InjectionPC
}
}
+
+
private void TimeGo()
{
System.Timers.Timer timer = new System.Timers.Timer();
@@ -1451,9 +1501,10 @@ namespace InjectionPC
int[] same = new int[partNo.Length];
#region 判断有几个零件号
-
+ int mould = 0;
for (int j = 0; j < partNo.Length; j++)
{
+ mould = j;
#region 根据零件号查找存货代码
DataTable sdt = productBll.SearchInfoByPartNo(partNo[j].ToString().Trim());
@@ -1468,8 +1519,21 @@ namespace InjectionPC
same[j] =0;
}
+
#endregion
+ DataTable dt3 = productBll.SearchInfoByPartNo(partNo[j].ToString().Trim());
+ if (dt3 != null && dt3.Rows.Count > 0)
+ {
+ QLevel = dt3.Rows[0]["QLevel"].ToString();
+ IsOne = dt3.Rows[0]["IsPrintOneTag"].ToString();
+ IsPack = dt3.Rows[0]["IsPrintPackList"].ToString();
+ IsPaint = dt3.Rows[0]["IsPlating"].ToString();
+ PartName = dt3.Rows[0]["ProductName"].ToString();
+ MaxCount = Convert.ToInt32(dt3.Rows[0]["PackCount"].ToString());
+ }
+
+
if (partNo.Length == 1 && same[j] == 1) //一个零件号，且一模两具生产的是两根一样的产品
{
for (int k = 0; k < 2; k++)
@@ -1490,7 +1554,9 @@ namespace InjectionPC
// NewOneCode = stockNo[j].ToString().Trim() + Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) + Program.ProductDate.Substring(8, 2) + "0001";
//}
- GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), true, ref NewOneCode, ref newcode);
+
+
+ GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), true, mould.ToString(), PartName, ref NewOneCode, ref newcode);
#region 插入数据tb_barCode
@@ -1518,12 +1584,14 @@ namespace InjectionPC
}
}
- if (brbll.Add_Info_New(md, Program.tableName) == false)
+ //if (brbll.Add_Info_New(md, Program.tableName) == false)
+ if (SaveBarCode(md, Program.tableName, true, same[j].ToString()) == false)
{
int a = 0;
for (int l = 0; l < 5; l++)
{
- if (brbll.Add_Info_New(md, Program.tableName))
+ //if (brbll.Add_Info_New(md, Program.tableName))
+ if (SaveBarCode(md, Program.tableName, true, same[j].ToString()) == false)
{
break;
}
@@ -1574,16 +1642,7 @@ namespace InjectionPC
#region 打印条码，判断是否打印单个条码
- DataTable dt3 = productBll.SearchInfoByPartNo(partNo[j].ToString().Trim());
- if (dt3 != null && dt3.Rows.Count > 0)
- {
- QLevel = dt3.Rows[0]["QLevel"].ToString();
- IsOne = dt3.Rows[0]["IsPrintOneTag"].ToString();
- IsPack = dt3.Rows[0]["IsPrintPackList"].ToString();
- IsPaint = dt3.Rows[0]["IsPlating"].ToString();
- PartName = dt3.Rows[0]["ProductName"].ToString();
- MaxCount = Convert.ToInt32(dt3.Rows[0]["PackCount"].ToString());
- }
+
DataTable dt4 = pbll.SearchInfo(partNo[j].ToString().Trim(),
dt.Rows[0]["StationID"].ToString());
@@ -1737,7 +1796,7 @@ namespace InjectionPC
// NewOneCode = stockNo[j].ToString().Trim() + Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) + Program.ProductDate.Substring(8, 2) + "0001";
//}
- GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), true, ref NewOneCode, ref newcode);
+ GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(), true, mould.ToString(), PartName, ref NewOneCode, ref newcode);
#region 插入数据tb_barCode
@@ -1764,13 +1823,15 @@ namespace InjectionPC
}
}
- if (brbll.Add_Info_New(md, Program.tableName) == false)
- {
+ // if (brbll.Add_Info_New(md, Program.tableName) == false)
+ if (SaveBarCode(md, Program.tableName, true, same[j].ToString()) == false)
+ {
int a = 0;
for (int l = 0; l < 5; l++)
{
- if (brbll.Add_Info_New(md, Program.tableName))
- {
+ //if (brbll.Add_Info_New(md, Program.tableName))
+ if (SaveBarCode(md, Program.tableName, true, same[j].ToString()) == false)
+ {
break;
}
@@ -1820,16 +1881,16 @@ namespace InjectionPC
#region 打印条码，判断是否打印单个条码
- DataTable dt3 = productBll.SearchInfoByPartNo(partNo[j].ToString().Trim());
- if (dt3 != null && dt3.Rows.Count > 0)
- {
- QLevel = dt3.Rows[0]["QLevel"].ToString();
- IsOne = dt3.Rows[0]["IsPrintOneTag"].ToString();
- IsPack = dt3.Rows[0]["IsPrintPackList"].ToString();
- IsPaint = dt3.Rows[0]["IsPlating"].ToString();
- PartName = dt3.Rows[0]["ProductName"].ToString();
- MaxCount = Convert.ToInt32(dt3.Rows[0]["PackCount"].ToString());
- }
+ //DataTable dt3 = productBll.SearchInfoByPartNo(partNo[j].ToString().Trim());
+ //if (dt3 != null && dt3.Rows.Count > 0)
+ //{
+ // QLevel = dt3.Rows[0]["QLevel"].ToString();
+ // IsOne = dt3.Rows[0]["IsPrintOneTag"].ToString();
+ // IsPack = dt3.Rows[0]["IsPrintPackList"].ToString();
+ // IsPaint = dt3.Rows[0]["IsPlating"].ToString();
+ // PartName = dt3.Rows[0]["ProductName"].ToString();
+ // MaxCount = Convert.ToInt32(dt3.Rows[0]["PackCount"].ToString());
+ //}
DataTable dt4 = pbll.SearchInfo(partNo[j].ToString().Trim(),
dt.Rows[0]["StationID"].ToString());
@@ -2096,9 +2157,12 @@ namespace InjectionPC
{
glacialList1.Items.Add(i.ToString());
glacialList1.Items[i].SubItems[0].Text = dt.Rows[i]["BarCode"].ToString();
+ glacialList1.Items[i].SubItems[0].Tag = dt.Rows[i]["BoxNo"].ToString();
glacialList1.Items[i].SubItems[1].Text = dt.Rows[i]["ProductName"].ToString();
glacialList1.Items[i].SubItems[2].Text = dt.Rows[i]["PrintType"].ToString();
glacialList1.Items[i].SubItems[3].Text = dt.Rows[i]["CreateTime"].ToString() == "" ? "" : Convert.ToDateTime(dt.Rows[i]["CreateTime"].ToString()).ToString("yyyy-MM-dd HH:mm:ss");
+ //glacialList1.Items[i].SubItems[4].Text = dt.Rows[i]["BoxNo"].ToString();
+
}
}
}
@@ -2237,182 +2301,7 @@ namespace InjectionPC
}
}
-
- ///
- /// 手工打印箱单
- ///
- ///
- ///
- //private void label17_Click(object sender, EventArgs e)
- //{
- // try
- // {
- // InjectionPlanBLL bll = new InjectionPlanBLL();
- // InjectionBoxBLL boxbll = new InjectionBoxBLL();
- // InjectionBoxModel boxmd=new InjectionBoxModel();
- // ProductBLL productBll = new ProductBLL();
- // BarCodeBLL brbll = new BarCodeBLL();
- // PlasticBLL pbll = new PlasticBLL();
- // string planID = "", filename = "", QLevel = "", IsOne = "", IsPack = "", IsPaint = "", PartName = "", printName = "", printBoxName="";
- // int CurrentCount = 0, MaxCount = 0;
-
- // DataTable dt = bll.SearchInfoByName(Program.station);
- // if (dt != null && dt.Rows.Count > 0)
- // {
- // planID = dt.Rows[0]["InjectionPlanID"].ToString();
- // string[] partNo = dt.Rows[0]["PartNo"].ToString().Split(',');
- // string[] stockNo = dt.Rows[0]["StockNo"].ToString().Split(',');
- // string ProductNature = dt.Rows[0]["ProductNature"].ToString();
-
- // DataTable dt5 = null;
- // for (int i = 0; i < partNo.Length; i++)
- // {
- // if (ProductNature[i].ToString().Trim() == "正常件")
- // {
- // #region 判断是否有市场件,有：提示打印；无：不提示直接打印
-
- // DataTable dt7 = brbll.IsHave(partNo[i].ToString().Trim(),
- // dt.Rows[0]["StationID"].ToString(), Program.tableName);
- // if (dt7 != null && dt7.Rows.Count > 0)
- // {
- // DialogResult result = MessageBox.Show("是否打印" + ProductNature + "的箱单?",
- // "提示", MessageBoxButtons.YesNo,
- // MessageBoxIcon.Information);
- // if (result == DialogResult.Yes)
- // {
- // dt5 = brbll.SearchBoxIsNull(partNo[i].ToString().Trim(),
- // dt.Rows[0]["StationID"].ToString(), Program.tableName, ProductNature);
- // }
- // else
- // {
- // dt5 = brbll.SearchBoxIsNull(partNo[i].ToString().Trim(),
- // dt.Rows[0]["StationID"].ToString(), Program.tableName, "售后件");
- // }
- // }
- // else
- // {
- // dt5 = brbll.SearchBoxIsNull(partNo[i].ToString().Trim(),
- // dt.Rows[0]["StationID"].ToString(), Program.tableName, ProductNature);
- // }
- // #endregion
-
- // }
- // else
- // {
- // dt5 = brbll.SearchBoxIsNull(partNo[i].ToString().Trim(),
- // dt.Rows[0]["StationID"].ToString(), Program.tableName, ProductNature );
- // }
-
- // if (dt5 != null && dt5.Rows.Count > 0)
- // {
- // CurrentCount = Convert.ToInt32(dt5.Rows[0]["SumCount"].ToString());
- // if (CurrentCount == 0)
- // {
- // MessageBox.Show("当前零件数量为0，不需要打印箱单", "提示", MessageBoxButtons.OK);
- // return;
- // }
- // }
-
- // DataTable dt3 = productBll.SearchInfoByPartNo(partNo[i].ToString().Trim());
- // if (dt3 != null && dt3.Rows.Count > 0)
- // {
- // QLevel = dt3.Rows[0]["QLevel"].ToString();
- // IsOne = dt3.Rows[0]["IsPrintOneTag"].ToString();
- // IsPack = dt3.Rows[0]["IsPrintPackList"].ToString();
- // IsPaint = dt3.Rows[0]["IsPlating"].ToString();
- // PartName = dt3.Rows[0]["ProductName"].ToString();
- // MaxCount = Convert.ToInt32(dt3.Rows[0]["PackCount"].ToString());
- // }
-
- // DataTable dt4 = pbll.SearchInfo(partNo[i].ToString().Trim(),
- // dt.Rows[0]["StationID"].ToString());
- // if (dt4 != null && dt4.Rows.Count > 0)
- // {
- // printName = "Printer" + dt4.Rows[0]["PrinterNo"].ToString();
- // }
-
- // #region 生成箱单并打印
-
- // filename = System.AppDomain.CurrentDomain.BaseDirectory + "装箱单.grf";
- // DataTable headTable = new DataTable();
- // headTable.Columns.Add("BoxNo");
- // headTable.Columns.Add("PartName");
- // headTable.Columns.Add("PartNo");
- // headTable.Columns.Add("BatchNo");
- // headTable.Columns.Add("PackCount");
- // headTable.Columns.Add("QLevel");
- // DataRow row = headTable.NewRow();
-
- // row["BatchNo"] = Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) + Program.ProductDate.Substring(8, 2);
-
- // #region 查询当前批次装箱单
-
- // DataTable dt6 = boxbll.SeachInfoByBox(partNo[i].ToString().Trim(), Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) + Program.ProductDate.Substring(8, 2));
- // if (dt6 != null && dt6.Rows.Count > 0)
- // {
- // row["BoxNo"] =
- // dt6.Rows[0]["BoxNo"].ToString().Substring(0,
- // dt6.Rows[0]["BoxNo"].ToString().Length - 6) +
- // (Convert.ToInt32(dt6.Rows[0]["BoxNo"].ToString()
- // .Substring(dt6.Rows[0]["BoxNo"].ToString().Length - 6, 6)) + 1)
- // .ToString().PadLeft(6, '0');
- // }
- // else
- // {
- // row["BoxNo"] =
- // partNo[i].ToString().Trim() + "." +
- // Program.ProductDate.Substring(2, 2) +
- // Program.ProductDate.Substring(5, 2) +
- // Program.ProductDate.Substring(8, 2) + "." + "000001";
- // }
-
- // #endregion
-
- // row["PartNo"] = partNo[i].ToString().Trim();
- // row["PartName"] = PartName;
- // row["PackCount"] = CurrentCount.ToString() + " EA";
- // row["QLevel"] = QLevel;
-
- // #region 更新barCode表中BoxNo的绑定关系
-
- // brbll.UpdateBoxNo(Program.tableName, row["BoxNo"].ToString(),
- // partNo[i].ToString().Trim());
-
- // #endregion
-
- // #region 保存箱单记录
-
- // boxmd.ID = Guid.NewGuid().ToString();
- // boxmd.BoxNo = row["BoxNo"].ToString();
- // boxmd.IsFlag = 0;
- // boxmd.BoxCount = CurrentCount;
-
- // boxbll.AddInfo(boxmd);
-
- // #endregion
-
- // #region 打印箱单
-
- // printBoxName = "Printer" + (Convert.ToInt32(printName.Substring(7, 1)) + 2).ToString();
- // string reportName = ConfigurationManager.AppSettings[printBoxName].ToString();
- // headTable.Rows.Add(row);
-
- // ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName);
-
- // rp.Report.Print(false);
-
- // #endregion
-
- // #endregion
- // }
- // }
- // }
- // catch (Exception ex)
- // {
- // LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
- // }
- //}
-
+
///
/// 手工打印条码
///
@@ -2425,7 +2314,7 @@ namespace InjectionPC
string IsPack = "", IsOne = "", QLevel = "", IsPaint = "", PartName = "", printBoxName="",IsSupply="",ManufacturerName="";
string filename = "", printName = "";
int MaxCount = 0, CurrentCount = 0;
-
+ CheckPackageSelect();
ProductBLL pbll = new ProductBLL();
BarCodeBLL bll = new BarCodeBLL();
BarCodeModel md = new BarCodeModel();
@@ -2543,7 +2432,7 @@ namespace InjectionPC
for (int i = 1; i <= Convert.ToInt32(textBox2.Text.Trim()); i++)
{
- GetSjBarCode(stockNo, partNo,false, ref NewOneCode, ref newcode);
+ GetSjBarCode(stockNo, partNo,false,"0", PartName, ref NewOneCode, ref newcode);
string[] part = newcode.Split('.');
@@ -2573,8 +2462,9 @@ namespace InjectionPC
}
}
- if (bll.Add_Info_New(md, Program.tableName) == false)
- {
+ //if (bll.Add_Info_New(md, Program.tableName) == false)
+ if (SaveBarCode(md, Program.tableName,false, "1") == false)
+ {
return;
}
@@ -2628,11 +2518,7 @@ namespace InjectionPC
}
-
-
-
-
-
+ #region 原来的 已注释
//DataTable dt = bll.SearchSerialNoByBarCodeNew(partNo + "." + textBox1.Text.Trim(), Program.tableName);
//if (dt != null && dt.Rows.Count > 0)
//{
@@ -2741,7 +2627,7 @@ namespace InjectionPC
// {
// //newcode = partNo + "." + textBox1.Text.Trim() + "." + i.ToString().PadLeft(4, '0');
// //NewOneCode = stockNo + textBox1.Text.Trim() + i.ToString().PadLeft(4, '0');
-
+
// GetSjBarCode(stockNo, partNo,false, ref NewOneCode, ref newcode);
// string[] part = newcode.Split('.');
@@ -2816,6 +2702,7 @@ namespace InjectionPC
// #endregion
// }
//}
+ #endregion
#endregion
}
@@ -2829,7 +2716,7 @@ namespace InjectionPC
// (Convert.ToInt32(code.Substring(23, 3)) +
// i).ToString()
// .PadLeft(3, '0') + "#";
- GetSupplyCode(partNo, QLevel,false, ref newcode);
+ GetSupplyCode(partNo, QLevel,false, "0", PartName, ref newcode);
#region 插入数据tb_barCode
@@ -2855,8 +2742,9 @@ namespace InjectionPC
}
}
- if (bll.Add_Info_New(md, Program.tableName) == false)
- {
+ //if (bll.Add_Info_New(md, Program.tableName) == false)
+ if (SaveBarCode(md, Program.tableName, false, "0") == false)
+ {
return;
}
@@ -3138,7 +3026,9 @@ namespace InjectionPC
md.PrintType = 2;
- DataTable pdt = pbll.SearchIsImportByPartNo(md.PartNo);
+ //DataTable pdt = pbll.SearchIsImportByPartNo(md.PartNo);
+
+ DataTable pdt = pbll.SearchInfoByPartNo(md.PartNo);
if (pdt != null && pdt.Rows.Count > 0)
{
if (pdt.Rows[0]["isImport"].ToString() == "1")
@@ -3151,10 +3041,17 @@ namespace InjectionPC
}
ManufacturerName = pdt.Rows[0]["ManufacturerName"].ToString().Trim();
+
}
}
+ else
+ {
+ MessageBox.Show($"补打失败,条码[{code}]在表[{ Program.tableName}]中不存在!");
+ return;
+ }
- if (bll.Add_Info_New(md, Program.tableName)==false)
+ if (bll.Add_Info_New(md, Program.tableName) == false)
+ // if (SaveBarCode(md, Program.tableName, true) == false) 补打不装箱
{
return;
}
@@ -3406,6 +3303,8 @@ namespace InjectionPC
{
try
{
+ if (UnCompletePrintBox("切换下一计划","all") == false) return;
+
InjectionPlanBLL planbll=new InjectionPlanBLL();
#region 查询有无下一计划
@@ -3603,12 +3502,17 @@ namespace InjectionPC
{
try
{
+
if (label13.Text == "暂停打印")
{
+
DialogResult result = MessageBox.Show("确认暂停打印？", "提示", MessageBoxButtons.OKCancel,
MessageBoxIcon.Information);
if (result == DialogResult.OK)
{
+ if (UnCompletePrintBox("切换手动打印","all") == false) return;
+
+ cboxHandBox.Enabled = true;
opcServer.OPCGroups.RemoveAll();
opcServer.Disconnect();
serialPort1.Close();
@@ -3633,9 +3537,13 @@ namespace InjectionPC
else
{
+
DialogResult result = MessageBox.Show("确认开始打印？", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Information);
if (result == DialogResult.OK)
{
+ if (UnCompletePrintBox("切换自动打印","all") == false) return;
+
+ cboxHandBox.Enabled = false;
#region 连接PLC
if (CreateServer())
@@ -3740,6 +3648,18 @@ namespace InjectionPC
private void label9_Click(object sender, EventArgs e)
{
Form fr = new FrmQuality();
+ fr.FormClosed += (arg1, arg2) =>
+ {
+ try
+ {
+ InitPackageInfo();
+ initBarCode();
+ }
+ catch(Exception ex)
+ {
+
+ }
+ };
fr.Show();
}
@@ -3828,7 +3748,7 @@ namespace InjectionPC
int IsSame = 0;
#region 判断有几个零件号
-
+ string mould = "0";
for (int j = 0; j < partNo.Length; j++)
{
#region 根据零件号查找存货代码
@@ -3847,6 +3767,18 @@ namespace InjectionPC
#endregion
+ DataTable dt3 = productBll.SearchInfoByPartNo(partNo[j].ToString().Trim());
+ if (dt3 != null && dt3.Rows.Count > 0)
+ {
+ QLevel = dt3.Rows[0]["QLevel"].ToString();
+ IsOne = dt3.Rows[0]["IsPrintOneTag"].ToString();
+ IsPack = dt3.Rows[0]["IsPrintPackList"].ToString();
+ IsPaint = dt3.Rows[0]["IsPlating"].ToString();
+ PartName = dt3.Rows[0]["ProductName"].ToString();
+ MaxCount = Convert.ToInt32(dt3.Rows[0]["PackCount"].ToString());
+ IsSupply = dt3.Rows[0]["IsSupply"].ToString();
+ }
+
if (IsSame == 1)
{
for (int k = 0; k < 2; k++)
@@ -3873,7 +3805,7 @@ namespace InjectionPC
// "0001";
//}
- GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(),true, ref NewOneCode, ref newcode);
+ GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(),true, mould, PartName, ref NewOneCode, ref newcode);
#region 插入数据tb_barCode
@@ -3900,8 +3832,9 @@ namespace InjectionPC
}
}
- if (brbll.Add_Info_New(md, Program.tableName)==false)
- {
+ //if (brbll.Add_Info_New(md, Program.tableName)==false)
+ if (SaveBarCode(md, Program.tableName, true, mould) == false)
+ {
return;
}
@@ -3909,17 +3842,17 @@ namespace InjectionPC
#region 打印条码，判断是否打印单个条码
- DataTable dt3 = productBll.SearchInfoByPartNo(partNo[j].ToString().Trim());
- if (dt3 != null && dt3.Rows.Count > 0)
- {
- QLevel = dt3.Rows[0]["QLevel"].ToString();
- IsOne = dt3.Rows[0]["IsPrintOneTag"].ToString();
- IsPack = dt3.Rows[0]["IsPrintPackList"].ToString();
- IsPaint = dt3.Rows[0]["IsPlating"].ToString();
- PartName = dt3.Rows[0]["ProductName"].ToString();
- MaxCount = Convert.ToInt32(dt3.Rows[0]["PackCount"].ToString());
- IsSupply = dt3.Rows[0]["IsSupply"].ToString();
- }
+ //DataTable dt3 = productBll.SearchInfoByPartNo(partNo[j].ToString().Trim());
+ //if (dt3 != null && dt3.Rows.Count > 0)
+ //{
+ // QLevel = dt3.Rows[0]["QLevel"].ToString();
+ // IsOne = dt3.Rows[0]["IsPrintOneTag"].ToString();
+ // IsPack = dt3.Rows[0]["IsPrintPackList"].ToString();
+ // IsPaint = dt3.Rows[0]["IsPlating"].ToString();
+ // PartName = dt3.Rows[0]["ProductName"].ToString();
+ // MaxCount = Convert.ToInt32(dt3.Rows[0]["PackCount"].ToString());
+ // IsSupply = dt3.Rows[0]["IsSupply"].ToString();
+ //}
DataTable dt4 = pbll.SearchInfo(partNo[j].ToString().Trim(),
dt.Rows[0]["StationID"].ToString());
@@ -4084,7 +4017,7 @@ namespace InjectionPC
// Program.ProductDate.Substring(5, 2) + Program.ProductDate.Substring(8, 2) + "0001";
//}
- GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(),true, ref NewOneCode, ref newcode);
+ GetSjBarCode(stockNo[j].ToString().Trim(), partNo[j].ToString().Trim(),true, mould, PartName, ref NewOneCode, ref newcode);
#region 插入数据tb_barCode
@@ -4111,8 +4044,9 @@ namespace InjectionPC
}
}
- if (brbll.Add_Info_New(md, Program.tableName)==false)
- {
+ //if (brbll.Add_Info_New(md, Program.tableName)==false)
+ if (SaveBarCode(md, Program.tableName, true, mould) == false)
+ {
return;
}
@@ -4120,17 +4054,17 @@ namespace InjectionPC
#region 打印条码，判断是否打印单个条码
- DataTable dt3 = productBll.SearchInfoByPartNo(partNo[j].ToString().Trim());
- if (dt3 != null && dt3.Rows.Count > 0)
- {
- QLevel = dt3.Rows[0]["QLevel"].ToString();
- IsOne = dt3.Rows[0]["IsPrintOneTag"].ToString();
- IsPack = dt3.Rows[0]["IsPrintPackList"].ToString();
- IsPaint = dt3.Rows[0]["IsPlating"].ToString();
- PartName = dt3.Rows[0]["ProductName"].ToString();
- MaxCount = Convert.ToInt32(dt3.Rows[0]["PackCount"].ToString());
- IsSupply = dt3.Rows[0]["IsSupply"].ToString();
- }
+ //DataTable dt3 = productBll.SearchInfoByPartNo(partNo[j].ToString().Trim());
+ //if (dt3 != null && dt3.Rows.Count > 0)
+ //{
+ // QLevel = dt3.Rows[0]["QLevel"].ToString();
+ // IsOne = dt3.Rows[0]["IsPrintOneTag"].ToString();
+ // IsPack = dt3.Rows[0]["IsPrintPackList"].ToString();
+ // IsPaint = dt3.Rows[0]["IsPlating"].ToString();
+ // PartName = dt3.Rows[0]["ProductName"].ToString();
+ // MaxCount = Convert.ToInt32(dt3.Rows[0]["PackCount"].ToString());
+ // IsSupply = dt3.Rows[0]["IsSupply"].ToString();
+ //}
DataTable dt4 = pbll.SearchInfo(partNo[j].ToString().Trim(),
dt.Rows[0]["StationID"].ToString());
@@ -4282,7 +4216,6 @@ namespace InjectionPC
LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
}
}
-
private void timer2_Tick(object sender, EventArgs e)
{
//InjectionPlanBLL bll = new InjectionPlanBLL();
@@ -4336,14 +4269,16 @@ namespace InjectionPC
{
GlacialComponents.Controls.GLItem gv;
gv = glacialList1.SelectedItems[0] as GlacialComponents.Controls.GLItem;
- Program.strBarCode = gv.Text;
+ Program.strBarCode = gv.Text;
+ //Program.strBoxCode = gv.SubItems[4].Text;
+ Program.strBoxCode = gv.SubItems[0].Tag?.ToString();
}
}
catch (Exception ex)
{
- LogErrBLL.AddInfo(ex.ToString(),MethodBase.GetCurrentMethod());
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
}
-
+
}
private void timer3_Tick(object sender, EventArgs e)
@@ -4398,9 +4333,9 @@ namespace InjectionPC
}
catch (Exception ex)
{
- LogErrBLL.AddInfo(ex.ToString(),MethodBase.GetCurrentMethod());
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
}
-
+
}
private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
@@ -4408,7 +4343,7 @@ namespace InjectionPC
Program.cc = comboBox1.Text;
}
-
+
private DateTime GetPrintTime(string station)
{
@@ -4422,7 +4357,7 @@ namespace InjectionPC
{
if (string.IsNullOrEmpty(dt.Rows[0]["PrintTime"].ToString()))
{
- time=DateTime.Now;
+ time = DateTime.Now;
}
else
{
@@ -4434,12 +4369,12 @@ namespace InjectionPC
}
catch (Exception ex)
{
- LogErrBLL.AddInfo(ex.ToString(),MethodBase.GetCurrentMethod());
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
return DateTime.Now;
}
}
-
+
private bool UpdatePrintTime(DateTime time, string station)
{
@@ -4514,27 +4449,277 @@ namespace InjectionPC
if (hours <= 0 && minutes <= 0 && seconds <= 0 && milliseconds <= 0)
hours += 24;
- lReturn = hours * 3600
+ lReturn = hours * 3600
+ minutes * 60
- + seconds ;
+ + seconds;
}
catch (Exception ex)
{
- LogErrBLL.AddInfo(ex.ToString(),MethodBase.GetCurrentMethod());
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
}
return lReturn;
}
+
+
+
+ bool SaveBarCode(BarCodeModel bcm,string tableName, bool isAutoPrint,string mould)
+ {
+ Label lbPackageCode = lbPackageCodeL;
+ Label lbCurrentlQty = lbCurrentlQtyL;
+ if (mould == _leftType)
+ {
+ lbPackageCode = lbPackageCodeL;
+ lbCurrentlQty = lbCurrentlQtyL;
+ }
+ else
+ {
+ lbPackageCode = lbPackageCodeR;
+ lbCurrentlQty = lbCurrentlQtyR;
+ }
+
+ bool saveRst = false;
+ //自动模式 或者手动模式选中绑定箱码
+ if (isAutoPrint == true || (isAutoPrint==false && cboxHandBox.Checked ==true))
+ {
+ bcm.BoxNo = lbPackageCode.Text.Trim();
+ saveRst = _barCodeBLL.Add_Info_New(bcm, Program.tableName);
+ if (saveRst == true)
+ {
+ //更新箱单数量
+ //查询箱单数量 是否等于标包数量 等于的话清空lb显示 小于,数量值赋值给lb显示
+ if (_injectionBoxBLL.UpdateBoxCount(bcm.BoxNo,1))
+ {
+ DataTable dt = _injectionBoxBLL.SearchBox(bcm.BoxNo);
+ if (dt.Rows.Count == 0)
+ {
+ return false;
+ }
+ string realCountStr = dt.Rows[0]["BoxCount"].ToString();
+ string sizeCountStr = lbNeedQtyL.Text.Trim();
+ int realCount = 0;
+ int sizeCount = 0;
+ int.TryParse(realCountStr, out realCount);
+ int.TryParse(sizeCountStr, out sizeCount);
+ if (realCount != 0 && realCount == sizeCount)
+ {
+ lbPackageCode.Text = "";
+ lbCurrentlQty.Text = "0";
+
+
+ ////检查上一个箱码是否给wms传成功了, 没成功重传一次.
+ //if (!string.IsNullOrEmpty(_lastBoxNoL))
+ //{
+ // if (_wmsBll.IsSendPackageCode(_lastBoxNoL) == false)
+ // {
+ // DataTable dt2 = _injectionBoxBLL.SearchBox(_lastBoxNoL);
+ // if (dt2.Rows.Count > 0)
+ // {
+ // _wmsBll.SaveInterface(dt2.Rows[0], MESClassLibrary.Enum.WmsInterfaceEnum.塑件箱码报工);
+ // }
+ // }
+ // _lastBoxNoL = "";
+
+ //}
+ //if (!string.IsNullOrEmpty(_lastBoxNoR))
+ //{
+ // if (_wmsBll.IsSendPackageCode(_lastBoxNoR) == false)
+ // {
+ // DataTable dt2 = _injectionBoxBLL.SearchBox(_lastBoxNoR);
+ // if (dt2.Rows.Count > 0)
+ // {
+ // _wmsBll.SaveInterface(dt2.Rows[0], MESClassLibrary.Enum.WmsInterfaceEnum.塑件箱码报工);
+ // }
+ // }
+ // _lastBoxNoR = "";
+
+ //}
+
+ ////wms接口传递
+ //_wmsBll.SaveInterface(dt.Rows[0]["BoxNo"].ToString(), MESClassLibrary.Enum.WmsInterfaceEnum.塑件箱码报工);
+
+ _wmsBll.SaveInterface(dt.Rows[0]["BoxNo"].ToString(), _lastBoxNoL, _lastBoxNoR, MESClassLibrary.Enum.WmsInterfaceEnum.塑件箱码报工);
+
+ _lastBoxNoL = lbPackageCodeL.Text;
+ _lastBoxNoR = lbPackageCodeR.Text;
+ PrintBoxCode(dt.Rows[0], realCount, mould);
+ }
+ else
+ {
+ lbCurrentlQty.Text = realCountStr;
+ }
+ }
+ }
+ else
+ {
+ saveRst = false;
+ }
+ }
+ else
+ {
+ //手动打印, 关闭打印箱码, 直接存条码记录.不处理其他
+ saveRst = _barCodeBLL.Add_Info_New(bcm, Program.tableName);
+ }
+
+ return saveRst;
+ }
+
+ void InitPackageInfo()
+ {
+ DataTable dt0 = _injectionBoxBLL.SearchUnBox(Program.station, "0");
+ if (dt0.Rows.Count > 0)
+ {
+ lbPackageCodeL.Text = dt0.Rows[0]["BoxNo"].ToString();
+ lbCurrentlQtyL.Text = dt0.Rows[0]["BoxCount"].ToString();
+ }
+ DataTable dt1 = _injectionBoxBLL.SearchUnBox(Program.station, "1");
+ if (dt1.Rows.Count > 0)
+ {
+ lbPackageCodeR.Text = dt1.Rows[0]["BoxNo"].ToString();
+ lbCurrentlQtyR.Text = dt1.Rows[0]["BoxCount"].ToString();
+ }
+ }
+
+ ///
+ /// 打印箱码
+ ///
+ ///
+ ///
+ ///
+ private void PrintBoxCode(DataRow boxRow,int realCount,string mould)
+ {
+ string filename = System.AppDomain.CurrentDomain.BaseDirectory + "装箱单.grf";
+ DataTable headTable = new DataTable();
+ headTable.Columns.Add("BoxNo");
+ headTable.Columns.Add("PartName");
+ headTable.Columns.Add("PartNo");
+ headTable.Columns.Add("BatchNo");
+ headTable.Columns.Add("PackCount");
+ headTable.Columns.Add("Line");
+ DataRow row = headTable.NewRow();
+ string boxCode = boxRow["BoxNo"].ToString();
+ string[] boxes = boxCode.Split('.');
+ if(boxes.Length != 4)
+ {
+ //新生成一个箱码 应该都有
+ }
+ else
+ {
+ row["BoxNo"] = boxCode;
+ row["PartNo"] = boxes[0].Trim();
+ row["PartName"] = boxRow["PartName"].ToString();
+ row["BatchNo"] = boxes[1].Trim();
+ row["PackCount"] = realCount;
+ row["Line"] = boxRow["StationNo"].ToString()+"注塑机";
+ }
+ UpdateBoxRecordPrintState(boxCode);
+ string printBoxName = string.Empty;
+ if (mould == "1")
+ {
+ printBoxName = "Printer3";
+ }
+ else
+ {
+ printBoxName = "Printer4";
+ }
+
+ string reportName = ConfigurationManager.AppSettings[printBoxName].ToString();
+ headTable.Rows.Add(row);
+
+ ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName);
+
+ rp.Report.Print(false);
+
+
+ }
+
+ private void UpdateBoxRecordPrintState(string UpdatePrinted)
+ {
+ _injectionBoxBLL.UpdatePrinted(UpdatePrinted);
+ }
+
+
+ ///
+ /// 检查是否有箱码. 没有箱码,生成一个箱码
+ ///
+ ///
+ ///
+ private void CheckPackageCode(string partCode, bool autoPrint,string mould, string partName)
+ {
+ if (autoPrint == true || (autoPrint == false && cboxHandBox.Checked == true))
+ {
+ Label lbPackageCode = lbPackageCodeL;
+ Label lbNeedQty = lbNeedQtyL;
+ if (mould == _leftType)
+ {
+ lbPackageCode = lbPackageCodeL;
+ lbNeedQty = lbNeedQtyL;
+ }
+ else
+ {
+ lbPackageCode = lbPackageCodeR;
+ lbNeedQty = lbNeedQtyR;
+ }
+ string pkgCode = lbPackageCode.Text.Trim();
+ if (string.IsNullOrEmpty(pkgCode))
+ {
+ string packageCode = GetPackageCode(partCode, autoPrint);
+ InjectionBoxModel boxmd = new InjectionBoxModel();
+ boxmd.ID = Guid.NewGuid().ToString();
+ boxmd.BoxNo = packageCode;
+ boxmd.BoxCount = 0;
+ boxmd.BoxType = 0;
+ boxmd.IsFlag = 0;
+ boxmd.StationNo = Program.station;
+ boxmd.PartName = partName;
+
+ boxmd.Mould = mould;
+ boxmd.StandardQty = lbNeedQty.Text;
+ if (_injectionBoxBLL.AddInfo(boxmd))
+ {
+ lbPackageCode.Text = packageCode;
+ }
+ }
+ }
+
+ }
+
///
/// 20位注塑条码
///
///
///
+ ///
+ ///
///
///
- void GetSjBarCode(string stockNo,string partNo, bool autoPrint, ref string newOneCode,ref string newCode)
+ void GetSjBarCode(string stockNo,string partNo, bool autoPrint,string mould,string partName, ref string newOneCode,ref string newCode)
+ {
+ CheckPackageCode(partNo, autoPrint, mould, partName);
+
+ string batch = GetBatch(autoPrint);
+
+ newOneCode = _uniqueBll.GetSjBarCodeSerialNo(stockNo, batch);
+ newCode = partNo + "." + batch + "." + newOneCode.Substring(newOneCode.Length - 4, 4);
+ }
+
+
+ string GetPackageCode(string partNo,bool autoPrint )
+ {
+ string batch = GetBatch(autoPrint);
+ string packageSize = lbNeedQtyL.Text.Trim();
+ if (string.IsNullOrEmpty(packageSize))
+ {
+ packageSize = "1";
+ }
+
+ string packageCode = _uniqueBll. GetPackageCodeSerialNo(partNo, batch, packageSize);
+ return packageCode;
+
+ }
+ string GetBatch(bool isAutoPrint)
{
string batch = string.Empty;
- if (autoPrint)
+ if (isAutoPrint)
{
batch = Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) + Program.ProductDate.Substring(8, 2);
}
@@ -4542,16 +4727,169 @@ namespace InjectionPC
{
batch = textBox1.Text.Trim();
}
- newOneCode = _uniqueBll.GetSjBarCodeSerialNo(stockNo, batch);
- newCode = partNo + "." + batch + "." + newOneCode.Substring(newOneCode.Length - 4, 4);
+ return batch;
+ }
+ private object _selectItemL = null;
+ bool _isShowHintL = true;
+
+ private object _selectItemR = null;
+ bool _isShowHintR = true;
+ private void comBoxSize_SelectedValueChanged(object sender, EventArgs e)
+ {
+ //TimeSpan interval = DateTime.Now - _loginTime;
+ //if (interval.Minutes > 0)
+ if(_isLoad == true)
+ {
+ if (_isShowHintL)
+ {
+ DialogResult result = MessageBox.Show("确认切换当前包装箱规格？", "提示", MessageBoxButtons.OKCancel,
+ MessageBoxIcon.Information);
+ if (result == DialogResult.OK)
+ {
+ if (UnCompletePrintBox("切换包装规格","left") == false)
+ {
+ _isShowHintL = false;
+ comBoxSizeL.SelectedItem = _selectItemL;
+ _isShowHintL = true;
+ return;
+ }
+
+ string val = comBoxSizeL.SelectedValue?.ToString();
+ int i = 0;
+ int.TryParse(val, out i);
+ if (i > 0)
+ {
+ lbNeedQtyL.Text = i.ToString();
+ }
+ }
+ else
+ {
+ if (_selectItemL != null)
+ {
+ _isShowHintL = false;
+ comBoxSizeL.SelectedItem = _selectItemL;
+ _isShowHintL = true;
+ }
+
+ }
+ }
+
+ }
+ else
+ {
+ string val = comBoxSizeL.SelectedValue?.ToString();
+ int i = 0;
+ int.TryParse(val, out i);
+ if (i > 0)
+ {
+ lbNeedQtyL.Text = i.ToString();
+ }
+ _selectItemL = comBoxSizeL.SelectedItem;
+ }
+
+ }
+ private void comBoxSizeR_SelectedValueChanged(object sender, EventArgs e)
+ {
+ //TimeSpan interval = DateTime.Now - _loginTime;
+ //if (interval.Minutes > 0)
+ if (_isLoad == true)
+ {
+ if (_isShowHintR)
+ {
+ DialogResult result = MessageBox.Show("确认切换当前包装箱规格？", "提示", MessageBoxButtons.OKCancel,
+ MessageBoxIcon.Information);
+ if (result == DialogResult.OK)
+ {
+ if (UnCompletePrintBox("切换包装规格", "right") == false)
+ {
+ _isShowHintR = false;
+ comBoxSizeR.SelectedItem = _selectItemR;
+ _isShowHintR = true;
+ return;
+ }
+
+ string val = comBoxSizeR.SelectedValue?.ToString();
+ int i = 0;
+ int.TryParse(val, out i);
+ if (i > 0)
+ {
+ lbNeedQtyR.Text = i.ToString();
+ }
+ }
+ else
+ {
+ if (_selectItemR != null)
+ {
+ _isShowHintR = false;
+ comBoxSizeR.SelectedItem = _selectItemR;
+ _isShowHintR = true;
+ }
+
+ }
+ }
+
+ }
+ else
+ {
+ string val = comBoxSizeR.SelectedValue?.ToString();
+ int i = 0;
+ int.TryParse(val, out i);
+ if (i > 0)
+ {
+ lbNeedQtyR.Text = i.ToString();
+ }
+ _selectItemR = comBoxSizeR.SelectedItem;
+ }
+
+
+
+ }
+ void CheckPackageSelect()
+ {
+ string txt = lbNeedQtyL.Text;
+ int i = 0;
+ if(_isPrintPackage)
+ {
+ int.TryParse(txt, out i);
+ if(i == 0)
+ {
+ throw new Exception("未选择装箱规格,请选择. ");
+ //MessageBox.Show("未选择装箱规格,请选择. ");
+ }
+ }
+ }
+
+ private void lbCurrentlQty_Click(object sender, EventArgs e)
+ {
+ string boxCode = "";
+ Label lb = sender as Label;
+ if(lb.Name == "lbCurrentlQtyL")
+ {
+ boxCode = lbPackageCodeL.Text?.Trim();
+ }
+ else
+ {
+ boxCode = lbPackageCodeR.Text?.Trim();
+ }
+ if (string.IsNullOrEmpty(boxCode)) return;
+
+ FrmPackageDetail frmPackageDetail = new FrmPackageDetail(boxCode);
+ frmPackageDetail.ShowDialog();
}
+
+ private void tableLayoutPanel1_Paint(object sender, PaintEventArgs e)
+ {
+
+ }
+
+
///
/// 直供件条码 A2478852600#Q02#240826#001#
///
///
///
///
- void GetSupplyCode(string partNo,string qLevel, bool autoPrint, ref string newCode)
+ void GetSupplyCode(string partNo,string qLevel, bool autoPrint,string mould,string partName, ref string newCode)
{
string batch = string.Empty;
if (autoPrint)
@@ -4563,7 +4901,104 @@ namespace InjectionPC
batch = textBox1.Text.Trim();
}
newCode = _uniqueBll.GetSupplySerialNo(partNo, qLevel, batch);
+
+ CheckPackageCode(partNo, autoPrint, mould, partName);
+ }
+
+ private void btnHandPrintL_Click(object sender, EventArgs e)
+ {
+ UnCompletePrintBox("手动打印箱码","left");
}
+
+ private void btnHandPrintR_Click(object sender, EventArgs e)
+ {
+ UnCompletePrintBox("手动打印箱码","right");
+ }
+
+ bool? lastCheckState = null;
+ ///
+ /// 手动打码是否打印箱码
+ ///
+ ///
+ ///
+ private void cboxHandBox_CheckedChanged(object sender, EventArgs e)
+ {
+ if (cboxHandBox.Enabled == false)
+ {
+ return;
+ }
+ string display = "";
+ if (cboxHandBox.Checked)
+ {
+ display = "绑定";
+ cboxHandBox.Tag = "true";
+ }
+ else
+ {
+ display = "解绑";
+ cboxHandBox.Tag = "false";
+ }
+ if (lastCheckState != cboxHandBox.Checked)
+ {
+ DialogResult result = MessageBox.Show($"确认手打条码与箱码{display}？", "提示", MessageBoxButtons.OKCancel,
+ MessageBoxIcon.Information);
+ if (result == DialogResult.OK)
+ {
+ if (UnCompletePrintBox("手打条码与箱码" + display,"all") == false)
+ {
+
+
+ if (cboxHandBox.Checked == true)
+ {
+ lastCheckState = false;
+ cboxHandBox.Checked = false;
+ }
+ else
+ {
+ lastCheckState = true;
+ cboxHandBox.Checked = true;
+ }
+
+ }
+ else
+ {
+ if (cboxHandBox.Checked == true)
+ {
+ lastCheckState = true;
+ }
+ else
+ {
+ lastCheckState = false;
+ }
+ }
+
+ }
+ else
+ {
+
+ if (cboxHandBox.Checked == true)
+ {
+ lastCheckState = false;
+ cboxHandBox.Checked = false;
+ }
+ else
+ {
+ lastCheckState = true;
+ cboxHandBox.Checked = true;
+ }
+ }
+
+
+ }
+
+ }
+
+ private void comBoxSizeL_SelectedIndexChanged(object sender, EventArgs e)
+ {
+
+ }
+
+
///
/// 用户双击
///
@@ -4581,6 +5016,8 @@ namespace InjectionPC
IsTest = true;
bool bbb = true;
//label23_Click(null, null);
+ textBox1.Text = Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) +
+ Program.ProductDate.Substring(8, 2);
if (bbb == true)
{ //自动
opcGroup1_DataChange(1, 1, ref a, ref b, ref c, ref d);
@@ -4600,7 +5037,58 @@ namespace InjectionPC
{
timer3.Enabled = false;
}
+ ///
+ /// 未满器具打箱码 变更规格型号,手工打印箱码,切换下一计划,手动自动切换
+ ///
+ ///
+ ///
+ bool UnCompletePrintBox(string lable,string leftOrRight)
+ {
+ string boxCodeL = lbPackageCodeL.Text?.Trim();
+ string boxCodeR = lbPackageCodeR.Text?.Trim();
+
+ if(leftOrRight == "left" || leftOrRight == "all")
+ {
+ if (!string.IsNullOrEmpty(boxCodeL))
+ {
+ DataTable dt = _injectionBoxBLL.SearchBox(boxCodeL);
+ if (dt.Rows.Count > 0 && dt.Rows[0]["IsPrint"].ToString() == "0" && int.Parse(dt.Rows[0]["BoxCount"].ToString()) > 0)
+ {
+ if (MessageBox.Show($"当前箱码[{boxCodeL}]未满器具,执行[{lable}]操作,该箱码会被设置为完成状态,是否继续?", "未满器具提醒", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
+ {
+ return false;
+ }
+ lbPackageCodeL.Text = "";
+ lbCurrentlQtyL.Text = "0";
+
+ _wmsBll.SaveInterface(dt.Rows[0]["BoxNo"].ToString(), "", "", MESClassLibrary.Enum.WmsInterfaceEnum.塑件箱码报工);
+
+ PrintBoxCode(dt.Rows[0], int.Parse(dt.Rows[0]["BoxCount"].ToString()), "0");
+ }
+ }
+ }
+ if (leftOrRight == "right" || leftOrRight == "all")
+ {
+ if (!string.IsNullOrEmpty(boxCodeR))
+ {
+ DataTable dt = _injectionBoxBLL.SearchBox(boxCodeR);
+ if (dt.Rows.Count > 0 && dt.Rows[0]["IsPrint"].ToString() == "0" && int.Parse(dt.Rows[0]["BoxCount"].ToString()) > 0)
+ {
+ if (MessageBox.Show($"当前箱码[{boxCodeR}]未满器具,执行[{lable}]操作,该箱码会被设置为完成状态,是否继续?", "未满器具提醒", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
+ {
+ return false;
+ }
+ lbPackageCodeR.Text = "";
+ lbCurrentlQtyR.Text = "0";
+ _wmsBll.SaveInterface(dt.Rows[0]["BoxNo"].ToString(), "", "", MESClassLibrary.Enum.WmsInterfaceEnum.塑件箱码报工);
+ PrintBoxCode(dt.Rows[0], int.Parse(dt.Rows[0]["BoxCount"].ToString()), "1");
+ }
+ }
+ }
+
+ return true;
+ }
}
}
diff --git a/InjectionPC/FrmPackageDetail.Designer.cs b/InjectionPC/FrmPackageDetail.Designer.cs
new file mode 100644
index 0000000..03b52ed
--- /dev/null
+++ b/InjectionPC/FrmPackageDetail.Designer.cs
@@ -0,0 +1,191 @@
+
+namespace InjectionPC
+{
+ partial class FrmPackageDetail
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.txtPackageCode = new System.Windows.Forms.TextBox();
+ this.btnSearch = new System.Windows.Forms.Button();
+ this.dataGridView1 = new System.Windows.Forms.DataGridView();
+ this.箱单号 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.条码 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.注塑码 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.零件号 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.时间 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.tableLayoutPanel1.SuspendLayout();
+ this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
+ this.SuspendLayout();
+ //
+ // tableLayoutPanel1
+ //
+ this.tableLayoutPanel1.ColumnCount = 1;
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+ this.tableLayoutPanel1.Controls.Add(this.panel1, 0, 0);
+ this.tableLayoutPanel1.Controls.Add(this.dataGridView1, 0, 1);
+ this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
+ this.tableLayoutPanel1.Name = "tableLayoutPanel1";
+ this.tableLayoutPanel1.RowCount = 3;
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 60F));
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 60F));
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(1785, 967);
+ this.tableLayoutPanel1.TabIndex = 0;
+ //
+ // panel1
+ //
+ this.panel1.Controls.Add(this.txtPackageCode);
+ this.panel1.Controls.Add(this.btnSearch);
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.panel1.Location = new System.Drawing.Point(3, 3);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(1779, 54);
+ this.panel1.TabIndex = 0;
+ //
+ // txtPackageCode
+ //
+ this.txtPackageCode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.txtPackageCode.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtPackageCode.Location = new System.Drawing.Point(1115, 5);
+ this.txtPackageCode.Name = "txtPackageCode";
+ this.txtPackageCode.Size = new System.Drawing.Size(483, 44);
+ this.txtPackageCode.TabIndex = 1;
+ //
+ // btnSearch
+ //
+ this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnSearch.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnSearch.Location = new System.Drawing.Point(1627, 0);
+ this.btnSearch.Name = "btnSearch";
+ this.btnSearch.Size = new System.Drawing.Size(153, 51);
+ this.btnSearch.TabIndex = 0;
+ this.btnSearch.Text = "查 询";
+ this.btnSearch.UseVisualStyleBackColor = true;
+ this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
+ //
+ // dataGridView1
+ //
+ this.dataGridView1.AllowUserToAddRows = false;
+ this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+ this.箱单号,
+ this.条码,
+ this.注塑码,
+ this.零件号,
+ this.时间});
+ dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window;
+ dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText;
+ dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle1;
+ this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.dataGridView1.Location = new System.Drawing.Point(3, 63);
+ this.dataGridView1.Name = "dataGridView1";
+ this.dataGridView1.RowHeadersWidth = 82;
+ this.dataGridView1.RowTemplate.Height = 37;
+ this.dataGridView1.Size = new System.Drawing.Size(1779, 841);
+ this.dataGridView1.TabIndex = 1;
+ //
+ // 箱单号
+ //
+ this.箱单号.DataPropertyName = "BoxNo";
+ this.箱单号.HeaderText = "箱单号";
+ this.箱单号.MinimumWidth = 10;
+ this.箱单号.Name = "箱单号";
+ this.箱单号.Width = 300;
+ //
+ // 条码
+ //
+ this.条码.DataPropertyName = "BarCode";
+ this.条码.HeaderText = "条码";
+ this.条码.MinimumWidth = 10;
+ this.条码.Name = "条码";
+ this.条码.Width = 300;
+ //
+ // 注塑码
+ //
+ this.注塑码.DataPropertyName = "OneBarCode";
+ this.注塑码.HeaderText = "注塑码";
+ this.注塑码.MinimumWidth = 10;
+ this.注塑码.Name = "注塑码";
+ this.注塑码.Width = 200;
+ //
+ // 零件号
+ //
+ this.零件号.DataPropertyName = "PartNo";
+ this.零件号.HeaderText = "零件号";
+ this.零件号.MinimumWidth = 10;
+ this.零件号.Name = "零件号";
+ this.零件号.Width = 200;
+ //
+ // 时间
+ //
+ this.时间.DataPropertyName = "CreateTime";
+ this.时间.HeaderText = "时间";
+ this.时间.MinimumWidth = 10;
+ this.时间.Name = "时间";
+ this.时间.Width = 200;
+ //
+ // FrmPackageDetail
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1785, 967);
+ this.Controls.Add(this.tableLayoutPanel1);
+ this.Name = "FrmPackageDetail";
+ this.Text = "箱单详细信息";
+ this.tableLayoutPanel1.ResumeLayout(false);
+ this.panel1.ResumeLayout(false);
+ this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
+ private System.Windows.Forms.Panel panel1;
+ private System.Windows.Forms.TextBox txtPackageCode;
+ private System.Windows.Forms.Button btnSearch;
+ private System.Windows.Forms.DataGridView dataGridView1;
+ private System.Windows.Forms.DataGridViewTextBoxColumn 箱单号;
+ private System.Windows.Forms.DataGridViewTextBoxColumn 条码;
+ private System.Windows.Forms.DataGridViewTextBoxColumn 注塑码;
+ private System.Windows.Forms.DataGridViewTextBoxColumn 零件号;
+ private System.Windows.Forms.DataGridViewTextBoxColumn 时间;
+ }
+}
\ No newline at end of file
diff --git a/InjectionPC/FrmPackageDetail.cs b/InjectionPC/FrmPackageDetail.cs
new file mode 100644
index 0000000..f9725d0
--- /dev/null
+++ b/InjectionPC/FrmPackageDetail.cs
@@ -0,0 +1,37 @@
+using MESClassLibrary.BLL.BasicInfo;
+using MESClassLibrary.BLL.Inspection;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace InjectionPC
+{
+ public partial class FrmPackageDetail : Form
+ {
+ private BarCodeBLL _barCodeBLL = new BarCodeBLL();
+ private InjectionBoxBLL _injectionBoxBLL = new InjectionBoxBLL();
+ private string _packageCode = string.Empty;
+
+ public FrmPackageDetail(string pPackageCode)
+ {
+ InitializeComponent();
+ this._packageCode = pPackageCode;
+ txtPackageCode.Text = pPackageCode;
+ dataGridView1.AutoGenerateColumns = false;
+ btnSearch_Click(null, null);
+ }
+
+ private void btnSearch_Click(object sender, EventArgs e)
+ {
+ string boxCode = txtPackageCode.Text?.Trim();
+ DataTable dt = _barCodeBLL.SearchBarCode(boxCode, Program.tableName, "200");
+
+ dataGridView1.DataSource = dt;
+ }
+ }
+}
diff --git a/InjectionPC/FrmPackageDetail.resx b/InjectionPC/FrmPackageDetail.resx
new file mode 100644
index 0000000..5b03a41
--- /dev/null
+++ b/InjectionPC/FrmPackageDetail.resx
@@ -0,0 +1,135 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
\ No newline at end of file
diff --git a/InjectionPC/FrmQuality.Designer.cs b/InjectionPC/FrmQuality.Designer.cs
index 71ac96e..57d91d6 100644
--- a/InjectionPC/FrmQuality.Designer.cs
+++ b/InjectionPC/FrmQuality.Designer.cs
@@ -13,11 +13,18 @@
/// true if managed resources should be disposed; otherwise, false.
protected override void Dispose(bool disposing)
{
- if (disposing && (components != null))
+ try
{
- components.Dispose();
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+ catch
+ {
+
}
- base.Dispose(disposing);
}
#region Windows Form Designer generated code
@@ -57,9 +64,12 @@
this.label12 = new System.Windows.Forms.Label();
this.textBox2 = new System.Windows.Forms.TextBox();
this.timer2 = new System.Windows.Forms.Timer(this.components);
+ this.lbBoxCode = new System.Windows.Forms.Label();
+ this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
+ this.tableLayoutPanel1.SuspendLayout();
this.SuspendLayout();
//
// timer1
@@ -71,9 +81,10 @@
this.label11.BackColor = System.Drawing.Color.DeepSkyBlue;
this.label11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label11.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label11.Location = new System.Drawing.Point(10, 595);
+ this.label11.Location = new System.Drawing.Point(20, 1189);
+ this.label11.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(169, 420);
+ this.label11.Size = new System.Drawing.Size(335, 838);
this.label11.TabIndex = 28;
this.label11.Text = "缺陷原因：";
this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -82,9 +93,10 @@
//
this.label8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label8.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label8.Location = new System.Drawing.Point(809, 92);
+ this.label8.Location = new System.Drawing.Point(1619, 184);
+ this.label8.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(184, 52);
+ this.label8.Size = new System.Drawing.Size(366, 102);
this.label8.TabIndex = 24;
this.label8.Text = "cy";
this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -94,9 +106,10 @@
this.label7.BackColor = System.Drawing.Color.DeepSkyBlue;
this.label7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label7.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label7.Location = new System.Drawing.Point(703, 92);
+ this.label7.Location = new System.Drawing.Point(1405, 184);
+ this.label7.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(110, 52);
+ this.label7.Size = new System.Drawing.Size(218, 102);
this.label7.TabIndex = 23;
this.label7.Text = "用户：";
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -105,9 +118,10 @@
//
this.label6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label6.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label6.Location = new System.Drawing.Point(548, 93);
+ this.label6.Location = new System.Drawing.Point(1096, 187);
+ this.label6.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(155, 52);
+ this.label6.Size = new System.Drawing.Size(309, 102);
this.label6.TabIndex = 22;
this.label6.Text = "IM01";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -117,9 +131,10 @@
this.label5.BackColor = System.Drawing.Color.DeepSkyBlue;
this.label5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label5.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label5.Location = new System.Drawing.Point(439, 93);
+ this.label5.Location = new System.Drawing.Point(877, 187);
+ this.label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(110, 52);
+ this.label5.Size = new System.Drawing.Size(218, 102);
this.label5.TabIndex = 21;
this.label5.Text = "工位：";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -133,9 +148,10 @@
this.comboBox1.Items.AddRange(new object[] {
"白班",
"夜班"});
- this.comboBox1.Location = new System.Drawing.Point(287, 93);
+ this.comboBox1.Location = new System.Drawing.Point(573, 187);
+ this.comboBox1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.comboBox1.Name = "comboBox1";
- this.comboBox1.Size = new System.Drawing.Size(152, 51);
+ this.comboBox1.Size = new System.Drawing.Size(300, 93);
this.comboBox1.TabIndex = 20;
//
// label4
@@ -143,9 +159,10 @@
this.label4.BackColor = System.Drawing.Color.DeepSkyBlue;
this.label4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label4.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label4.Location = new System.Drawing.Point(178, 93);
+ this.label4.Location = new System.Drawing.Point(356, 187);
+ this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(110, 52);
+ this.label4.Size = new System.Drawing.Size(218, 102);
this.label4.TabIndex = 19;
this.label4.Text = "班组：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -155,9 +172,10 @@
this.label3.BackColor = System.Drawing.Color.DeepSkyBlue;
this.label3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label3.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label3.Location = new System.Drawing.Point(10, 93);
+ this.label3.Location = new System.Drawing.Point(20, 187);
+ this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(169, 52);
+ this.label3.Size = new System.Drawing.Size(335, 102);
this.label3.TabIndex = 18;
this.label3.Text = "用户信息：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -166,9 +184,10 @@
//
this.label2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label2.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label2.Location = new System.Drawing.Point(1080, 4);
+ this.label2.Location = new System.Drawing.Point(2160, 8);
+ this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(187, 84);
+ this.label2.Size = new System.Drawing.Size(373, 166);
this.label2.TabIndex = 3;
this.label2.Text = "2019-05-29 10:30:31";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -178,9 +197,10 @@
//
this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
- this.pictureBox1.Location = new System.Drawing.Point(4, 4);
+ this.pictureBox1.Location = new System.Drawing.Point(8, 8);
+ this.pictureBox1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(169, 84);
+ this.pictureBox1.Size = new System.Drawing.Size(335, 166);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox1.TabIndex = 2;
this.pictureBox1.TabStop = false;
@@ -189,9 +209,10 @@
//
this.label1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label1.Font = new System.Drawing.Font("宋体", 28F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label1.Location = new System.Drawing.Point(172, 4);
+ this.label1.Location = new System.Drawing.Point(344, 8);
+ this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(911, 84);
+ this.label1.Size = new System.Drawing.Size(1821, 166);
this.label1.TabIndex = 1;
this.label1.Text = "注塑车间质量信息录入";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -200,10 +221,12 @@
//
this.label10.BackColor = System.Drawing.Color.DeepSkyBlue;
this.label10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.label10.Dock = System.Windows.Forms.DockStyle.Fill;
this.label10.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label10.Location = new System.Drawing.Point(10, 246);
+ this.label10.Location = new System.Drawing.Point(5, 0);
+ this.label10.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(169, 350);
+ this.label10.Size = new System.Drawing.Size(325, 346);
this.label10.TabIndex = 26;
this.label10.Text = "产品展示：";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -213,9 +236,10 @@
this.label9.BackColor = System.Drawing.Color.SpringGreen;
this.label9.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label9.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label9.Location = new System.Drawing.Point(993, 92);
+ this.label9.Location = new System.Drawing.Point(1987, 184);
+ this.label9.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(282, 52);
+ this.label9.Size = new System.Drawing.Size(562, 102);
this.label9.TabIndex = 25;
this.label9.Text = "切换到：条码打印";
this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -226,9 +250,10 @@
this.panel1.Controls.Add(this.label2);
this.panel1.Controls.Add(this.pictureBox1);
this.panel1.Controls.Add(this.label1);
- this.panel1.Location = new System.Drawing.Point(6, 5);
+ this.panel1.Location = new System.Drawing.Point(12, 11);
+ this.panel1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1269, 91);
+ this.panel1.Size = new System.Drawing.Size(2539, 181);
this.panel1.TabIndex = 17;
//
// label20
@@ -236,9 +261,10 @@
this.label20.BackColor = System.Drawing.Color.DeepSkyBlue;
this.label20.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label20.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label20.Location = new System.Drawing.Point(10, 144);
+ this.label20.Location = new System.Drawing.Point(20, 288);
+ this.label20.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label20.Name = "label20";
- this.label20.Size = new System.Drawing.Size(169, 52);
+ this.label20.Size = new System.Drawing.Size(335, 102);
this.label20.TabIndex = 34;
this.label20.Text = "扫描箱单：";
this.label20.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -248,9 +274,10 @@
this.label23.BackColor = System.Drawing.Color.DeepSkyBlue;
this.label23.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label23.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label23.Location = new System.Drawing.Point(10, 195);
+ this.label23.Location = new System.Drawing.Point(20, 389);
+ this.label23.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(169, 52);
+ this.label23.Size = new System.Drawing.Size(335, 102);
this.label23.TabIndex = 37;
this.label23.Text = "扫描条码：";
this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -258,9 +285,10 @@
// textBox3
//
this.textBox3.Font = new System.Drawing.Font("宋体", 28F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox3.Location = new System.Drawing.Point(178, 195);
+ this.textBox3.Location = new System.Drawing.Point(356, 389);
+ this.textBox3.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.textBox3.Name = "textBox3";
- this.textBox3.Size = new System.Drawing.Size(525, 50);
+ this.textBox3.Size = new System.Drawing.Size(1047, 93);
this.textBox3.TabIndex = 38;
this.textBox3.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox3_KeyDown);
//
@@ -269,9 +297,10 @@
this.label24.BackColor = System.Drawing.Color.DeepSkyBlue;
this.label24.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label24.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label24.Location = new System.Drawing.Point(704, 193);
+ this.label24.Location = new System.Drawing.Point(1408, 387);
+ this.label24.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label24.Name = "label24";
- this.label24.Size = new System.Drawing.Size(150, 52);
+ this.label24.Size = new System.Drawing.Size(298, 102);
this.label24.TabIndex = 39;
this.label24.Text = "产品名称：";
this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -279,17 +308,19 @@
// textBox4
//
this.textBox4.Font = new System.Drawing.Font("宋体", 28F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox4.Location = new System.Drawing.Point(853, 196);
+ this.textBox4.Location = new System.Drawing.Point(1707, 392);
+ this.textBox4.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.textBox4.Name = "textBox4";
- this.textBox4.Size = new System.Drawing.Size(417, 50);
+ this.textBox4.Size = new System.Drawing.Size(831, 93);
this.textBox4.TabIndex = 40;
//
// pictureBox2
//
this.pictureBox2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.pictureBox2.Location = new System.Drawing.Point(178, 248);
+ this.pictureBox2.Location = new System.Drawing.Point(356, 496);
+ this.pictureBox2.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.pictureBox2.Name = "pictureBox2";
- this.pictureBox2.Size = new System.Drawing.Size(1094, 348);
+ this.pictureBox2.Size = new System.Drawing.Size(2186, 694);
this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox2.TabIndex = 41;
this.pictureBox2.TabStop = false;
@@ -297,18 +328,20 @@
// panel2
//
this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.panel2.Location = new System.Drawing.Point(178, 595);
+ this.panel2.Location = new System.Drawing.Point(355, 1189);
+ this.panel2.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(1017, 420);
+ this.panel2.Size = new System.Drawing.Size(2030, 838);
this.panel2.TabIndex = 42;
//
// button1
//
this.button1.BackColor = System.Drawing.Color.DeepSkyBlue;
this.button1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button1.Location = new System.Drawing.Point(1193, 595);
+ this.button1.Location = new System.Drawing.Point(2387, 1189);
+ this.button1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(77, 420);
+ this.button1.Size = new System.Drawing.Size(155, 840);
this.button1.TabIndex = 40;
this.button1.Text = "报废";
this.button1.UseVisualStyleBackColor = false;
@@ -317,9 +350,10 @@
// textBox1
//
this.textBox1.Font = new System.Drawing.Font("宋体", 28F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox1.Location = new System.Drawing.Point(178, 146);
+ this.textBox1.Location = new System.Drawing.Point(356, 292);
+ this.textBox1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(525, 50);
+ this.textBox1.Size = new System.Drawing.Size(1047, 93);
this.textBox1.TabIndex = 43;
this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown);
//
@@ -328,9 +362,10 @@
this.label12.BackColor = System.Drawing.Color.DeepSkyBlue;
this.label12.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.label12.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label12.Location = new System.Drawing.Point(704, 145);
+ this.label12.Location = new System.Drawing.Point(1408, 291);
+ this.label12.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(150, 52);
+ this.label12.Size = new System.Drawing.Size(298, 102);
this.label12.TabIndex = 44;
this.label12.Text = "报废数量：";
this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -339,9 +374,10 @@
//
this.textBox2.Enabled = false;
this.textBox2.Font = new System.Drawing.Font("宋体", 28F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox2.Location = new System.Drawing.Point(853, 145);
+ this.textBox2.Location = new System.Drawing.Point(1707, 291);
+ this.textBox2.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(417, 50);
+ this.textBox2.Size = new System.Drawing.Size(831, 93);
this.textBox2.TabIndex = 45;
//
// timer2
@@ -350,11 +386,39 @@
this.timer2.Interval = 60000;
this.timer2.Tick += new System.EventHandler(this.timer2_Tick);
//
+ // lbBoxCode
+ //
+ this.lbBoxCode.AutoSize = true;
+ this.lbBoxCode.BackColor = System.Drawing.Color.DeepSkyBlue;
+ this.lbBoxCode.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.lbBoxCode.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbBoxCode.Location = new System.Drawing.Point(4, 346);
+ this.lbBoxCode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbBoxCode.Name = "lbBoxCode";
+ this.lbBoxCode.Size = new System.Drawing.Size(327, 346);
+ this.lbBoxCode.TabIndex = 46;
+ this.lbBoxCode.Text = "A2478850800.240923.002.001";
+ //
+ // tableLayoutPanel1
+ //
+ this.tableLayoutPanel1.ColumnCount = 1;
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+ this.tableLayoutPanel1.Controls.Add(this.lbBoxCode, 0, 1);
+ this.tableLayoutPanel1.Controls.Add(this.label10, 0, 0);
+ this.tableLayoutPanel1.Location = new System.Drawing.Point(20, 494);
+ this.tableLayoutPanel1.Name = "tableLayoutPanel1";
+ this.tableLayoutPanel1.RowCount = 2;
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(335, 692);
+ this.tableLayoutPanel1.TabIndex = 46;
+ //
// FrmQuality
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1280, 1024);
+ this.ClientSize = new System.Drawing.Size(2560, 2048);
+ this.Controls.Add(this.tableLayoutPanel1);
this.Controls.Add(this.textBox2);
this.Controls.Add(this.label12);
this.Controls.Add(this.textBox1);
@@ -374,10 +438,10 @@
this.Controls.Add(this.comboBox1);
this.Controls.Add(this.label4);
this.Controls.Add(this.label3);
- this.Controls.Add(this.label10);
this.Controls.Add(this.label9);
this.Controls.Add(this.panel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+ this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.Name = "FrmQuality";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "质量录入";
@@ -385,6 +449,8 @@
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.panel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
+ this.tableLayoutPanel1.ResumeLayout(false);
+ this.tableLayoutPanel1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -419,5 +485,7 @@
private System.Windows.Forms.Label label12;
private System.Windows.Forms.TextBox textBox2;
private System.Windows.Forms.Timer timer2;
+ private System.Windows.Forms.Label lbBoxCode;
+ private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
}
}
\ No newline at end of file
diff --git a/InjectionPC/FrmQuality.cs b/InjectionPC/FrmQuality.cs
index c6b9de1..fe23537 100644
--- a/InjectionPC/FrmQuality.cs
+++ b/InjectionPC/FrmQuality.cs
@@ -27,8 +27,9 @@ namespace InjectionPC
public partial class FrmQuality : Form
{
private static string position = "", reason = "";
+ private bool _isScanBarCode = true;
int count = 0; //缺陷图选择个数
-
+ private InjectionBoxBLL _injectionBoxBLL = new InjectionBoxBLL();
private string stationId = "";
public FrmQuality()
{
@@ -174,11 +175,12 @@ namespace InjectionPC
#endregion
textBox3.Text = Program.strBarCode;
+ lbBoxCode.Text = Program.strBoxCode;
textBox3.SelectAll();
if (ConfigurationManager.AppSettings["IsLast"] == "1")
{
- label9.Visible = false;
+ label9.Visible = true;
}
else if (ConfigurationManager.AppSettings["IsLast"] == "0")
{
@@ -199,8 +201,15 @@ namespace InjectionPC
private void timer_Tick(object sender, EventArgs e)
{
- label2.Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
- Thread.Sleep(500);
+ try
+ {
+ label2.Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ Thread.Sleep(500);
+ }
+ catch
+ {
+
+ }
}
@@ -351,6 +360,7 @@ namespace InjectionPC
#region 保存报废详细信息和是否装过箱，装过箱子的不允许报废
badmd.ID = Guid.NewGuid().ToString();
+ //直供件条码
if (textBox3.Text.Trim().Contains("#"))
{
badmd.BarCode = textBox3.Text.Trim();
@@ -359,26 +369,46 @@ namespace InjectionPC
{
badmd.OneBarCode = dt1.Rows[0]["OneBarCode"].ToString();
isbox = dt1.Rows[0]["BoxNo"].ToString();
- if (!string.IsNullOrEmpty(isbox))
- {
- MessageBox.Show("请产品已做装箱，不能做报废!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
- reason = "";
- textBox3.Text = "";
- textBox3.TabIndex = 0;
- textBox3.Focus();
-
- textBox4.Text = "";
- pictureBox2.Image = null;
-
- pictureBox2.Controls.Clear();
- panel2.Controls.Clear();
+ if (SubtrBoxCount(isbox) == false)
return;
- }
+
+ //if (!string.IsNullOrEmpty(isbox))
+ //{
+ // DataTable boxTable = _injectionBoxBLL.SearchBox(isbox);
+ // if (boxTable.Rows.Count > 0)
+ // {
+ // if(boxTable.Rows[0]["IsPrint"].ToString() == "1")
+ // {
+ // MessageBox.Show("请产品已做装箱，不能做报废!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ // reason = "";
+ // textBox3.Text = "";
+ // textBox3.TabIndex = 0;
+ // textBox3.Focus();
+
+ // textBox4.Text = "";
+ // pictureBox2.Image = null;
+
+ // pictureBox2.Controls.Clear();
+
+ // panel2.Controls.Clear();
+ // return;
+ // }
+ // else
+ // {
+ // _injectionBoxBLL.UpdateBoxCount(isbox, -1);
+ // }
+
+ // }
+
+
+
+ //}
}
}
else
{
+ //普通条码
if (textBox3.Text.Trim().Contains('.'))
{
badmd.BarCode = textBox3.Text.Trim();
@@ -386,6 +416,11 @@ namespace InjectionPC
if (dt != null && dt.Rows.Count > 0)
{
badmd.OneBarCode = dt.Rows[0]["OneBarCode"].ToString();
+
+ isbox = dt.Rows[0]["BoxNo"].ToString();
+ if (SubtrBoxCount(isbox) == false)
+ return;
+
}
else
{
@@ -393,6 +428,7 @@ namespace InjectionPC
return;
}
}
+ //20位注塑码
else
{
badmd.OneBarCode = textBox3.Text.Trim();
@@ -402,20 +438,24 @@ namespace InjectionPC
{
badmd.BarCode = dt1.Rows[0]["BarCode"].ToString();
isbox = dt1.Rows[0]["BoxNo"].ToString();
- if (!string.IsNullOrEmpty(isbox))
- {
- MessageBox.Show("请产品已做装箱，不能做报废!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
- reason = "";
- textBox3.Text = "";
- textBox3.TabIndex = 0;
- textBox3.Focus();
-
- textBox4.Text = "";
- pictureBox2.Image = null;
- pictureBox2.Controls.Clear();
- panel2.Controls.Clear();
+
+ if (SubtrBoxCount(isbox) == false)
return;
- }
+
+ //if (!string.IsNullOrEmpty(isbox))
+ //{
+ // MessageBox.Show("请产品已做装箱，不能做报废!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ // reason = "";
+ // textBox3.Text = "";
+ // textBox3.TabIndex = 0;
+ // textBox3.Focus();
+
+ // textBox4.Text = "";
+ // pictureBox2.Image = null;
+ // pictureBox2.Controls.Clear();
+ // panel2.Controls.Clear();
+ // return;
+ //}
}
}
@@ -541,7 +581,44 @@ namespace InjectionPC
position = "";
reason = "";
}
+ ///
+ /// 扣减箱码数量
+ ///
+ ///
+ ///
+ bool SubtrBoxCount(string boxCode)
+ {
+ if (!string.IsNullOrEmpty(boxCode))
+ {
+ DataTable boxTable = _injectionBoxBLL.SearchBox(boxCode);
+ if (boxTable.Rows.Count > 0)
+ {
+ if (boxTable.Rows[0]["IsPrint"].ToString() == "1")
+ {
+ MessageBox.Show("请产品已做装箱，不能做报废!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ reason = "";
+ textBox3.Text = "";
+ textBox3.TabIndex = 0;
+ textBox3.Focus();
+
+ textBox4.Text = "";
+ pictureBox2.Image = null;
+
+ pictureBox2.Controls.Clear();
+ panel2.Controls.Clear();
+ return false;
+ }
+ else
+ {
+ _injectionBoxBLL.UpdateBoxCount(boxCode, -1);
+ }
+
+ }
+
+ }
+ return true;
+ }
private static bool IsNumeric(string str)
{
System.Text.RegularExpressions.Regex reg1 = new System.Text.RegularExpressions.Regex(@"^[0-9]\d*$");
@@ -675,6 +752,7 @@ namespace InjectionPC
{
if (e.KeyCode == Keys.Enter)
{
+ _isScanBarCode = true;
string code = "";
string[] barcode=new string[3];
int row = 0, col = 0;
@@ -840,7 +918,7 @@ namespace InjectionPC
LineID = sdt.Rows[0]["LineID"].ToString();
}
- sdt.Dispose();
+ //sdt.Dispose();
int drow = 0, dcol = 6;
@@ -922,7 +1000,7 @@ namespace InjectionPC
textBox1.Focus();
return;
}
-
+
#region 判断箱单是否为小件，即看零件号是否需要打印单个条码
string[] aa = textBox1.Text.Split('.');
@@ -946,7 +1024,7 @@ namespace InjectionPC
}
#endregion
-
+ _isScanBarCode = false;
DataTable dt1 = bll.SearchBox(textBox1.Text);
if (dt1 != null && dt1.Rows.Count > 0)
{
diff --git a/InjectionPC/InjectionPC.csproj b/InjectionPC/InjectionPC.csproj
index ef8f18e..42b2acc 100644
--- a/InjectionPC/InjectionPC.csproj
+++ b/InjectionPC/InjectionPC.csproj
@@ -130,6 +130,12 @@
FrmMain_Injection.cs
+
+ Form
+
+
+ FrmPackageDetail.cs
+
Form
@@ -192,6 +198,9 @@
FrmMain_Injection.cs
+
+ FrmPackageDetail.cs
+
FrmQuality_New.cs
diff --git a/InjectionPC/Program.cs b/InjectionPC/Program.cs
index 6370fc0..9cdede3 100644
--- a/InjectionPC/Program.cs
+++ b/InjectionPC/Program.cs
@@ -4,6 +4,8 @@ using System.Linq;
using System.Windows.Forms;
using System.Data;
using System.Data.SqlClient;
+using System.Text;
+using System.Diagnostics;
namespace InjectionPC
{
@@ -29,7 +31,8 @@ namespace InjectionPC
public static string WeightPsw;
public static string tableName;
public static string strBarCode;
-
+ public static string strBoxCode;
+
public static int interVal;
[STAThread]
@@ -41,6 +44,19 @@ namespace InjectionPC
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
+
+ Application.SetUnhandledExceptionMode(UnhandledExceptionMode.CatchException);
+
+ //处理UI线程异常
+
+ Application.ThreadException += new System.Threading.ThreadExceptionEventHandler(Application_ThreadException);
+
+ //处理非UI线程异常
+
+ AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
+
+
+
//Application.Run(new FrmMain());
Application.Run(new FrmLogin());
mutex.ReleaseMutex();
@@ -93,5 +109,61 @@ namespace InjectionPC
}
}
}
+
+ #region 系统异常处理
+ static void Application_ThreadException(object sender, System.Threading.ThreadExceptionEventArgs e)
+ {
+ string str = GetExceptionMsg(e.Exception, e.ToString());
+ MessageBox.Show(str);
+ //LogManager.WriteLog(str);
+ }
+
+
+
+ static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
+ {
+ string str = GetExceptionMsg(e.ExceptionObject as Exception, e.ToString());
+ MessageBox.Show(str);
+ //LogManager.WriteLog(str);
+ }
+ static string GetExceptionMsg(Exception ex, string backStr)
+
+ {
+ StringBuilder sb = new StringBuilder();
+
+ sb.AppendLine("****************************异常文本****************************");
+
+ sb.AppendLine("【出现时间】：" + DateTime.Now.ToString());
+
+ if (ex != null)
+ {
+
+ sb.AppendLine("【异常类型】：" + ex.GetType().Name);
+
+ sb.AppendLine("【异常信息】：" + ex.Message);
+
+ sb.AppendLine("【堆栈调用】：" + ex.StackTrace);
+
+ }
+
+ else
+
+ {
+
+ sb.AppendLine("【未处理异常】：" + backStr);
+
+ }
+
+ sb.AppendLine("***************************************************************");
+
+ return sb.ToString();
+ }
+ private static void ExceptionMonitor_ExceptionOver()
+ {
+ MessageBox.Show("系统遇到未知异常，即将重新启动。");
+ Process.Start(Application.ExecutablePath);
+ Process.GetCurrentProcess().Kill();
+ }
+ #endregion
}
}
diff --git a/InjectionPC/bin/Debug/装箱单.grf b/InjectionPC/bin/Debug/装箱单.grf
index eeb1a1f..63d24a5 100644
Binary files a/InjectionPC/bin/Debug/装箱单.grf and b/InjectionPC/bin/Debug/装箱单.grf differ
diff --git a/InjectionPC/装箱单.grf b/InjectionPC/装箱单.grf
index eeb1a1f..63d24a5 100644
Binary files a/InjectionPC/装箱单.grf and b/InjectionPC/装箱单.grf differ
diff --git a/InjectionSearch/Form1.Designer.cs b/InjectionSearch/Form1.Designer.cs
index 0c2df13..c5b3c19 100644
--- a/InjectionSearch/Form1.Designer.cs
+++ b/InjectionSearch/Form1.Designer.cs
@@ -42,9 +42,10 @@
// pictureBox1
//
this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
- this.pictureBox1.Location = new System.Drawing.Point(1, 0);
+ this.pictureBox1.Location = new System.Drawing.Point(2, 0);
+ this.pictureBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(704, 456);
+ this.pictureBox1.Size = new System.Drawing.Size(1291, 798);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox1.TabIndex = 0;
this.pictureBox1.TabStop = false;
@@ -54,27 +55,30 @@
this.label2.AutoSize = true;
this.label2.BackColor = System.Drawing.Color.Transparent;
this.label2.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label2.Location = new System.Drawing.Point(224, 234);
+ this.label2.Location = new System.Drawing.Point(411, 410);
+ this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(47, 19);
+ this.label2.Size = new System.Drawing.Size(83, 34);
this.label2.TabIndex = 7;
this.label2.Text = "密码";
//
// textBox1
//
this.textBox1.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox1.Location = new System.Drawing.Point(304, 172);
+ this.textBox1.Location = new System.Drawing.Point(557, 301);
+ this.textBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.textBox1.Name = "textBox1";
- this.textBox1.Size = new System.Drawing.Size(159, 29);
+ this.textBox1.Size = new System.Drawing.Size(288, 45);
this.textBox1.TabIndex = 8;
//
// textBox2
//
this.textBox2.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.textBox2.Location = new System.Drawing.Point(304, 234);
+ this.textBox2.Location = new System.Drawing.Point(557, 410);
+ this.textBox2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.textBox2.Name = "textBox2";
this.textBox2.PasswordChar = '*';
- this.textBox2.Size = new System.Drawing.Size(159, 29);
+ this.textBox2.Size = new System.Drawing.Size(288, 45);
this.textBox2.TabIndex = 9;
this.textBox2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox2_KeyDown);
//
@@ -82,11 +86,12 @@
//
this.button1.BackColor = System.Drawing.Color.LightSkyBlue;
this.button1.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button1.Location = new System.Drawing.Point(239, 293);
+ this.button1.Location = new System.Drawing.Point(438, 513);
+ this.button1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(84, 38);
+ this.button1.Size = new System.Drawing.Size(154, 66);
this.button1.TabIndex = 10;
- this.button1.Text = "登陆";
+ this.button1.Text = "登录";
this.button1.UseVisualStyleBackColor = false;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
@@ -94,9 +99,10 @@
//
this.button2.BackColor = System.Drawing.Color.LightSkyBlue;
this.button2.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.button2.Location = new System.Drawing.Point(395, 293);
+ this.button2.Location = new System.Drawing.Point(724, 513);
+ this.button2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.button2.Name = "button2";
- this.button2.Size = new System.Drawing.Size(83, 38);
+ this.button2.Size = new System.Drawing.Size(152, 66);
this.button2.TabIndex = 11;
this.button2.Text = "取消";
this.button2.UseVisualStyleBackColor = false;
@@ -105,17 +111,18 @@
//
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label1.Location = new System.Drawing.Point(224, 181);
+ this.label1.Location = new System.Drawing.Point(411, 317);
+ this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(66, 19);
+ this.label1.Size = new System.Drawing.Size(117, 34);
this.label1.TabIndex = 6;
this.label1.Text = "用户名";
//
// FrmLogin
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(703, 453);
+ this.ClientSize = new System.Drawing.Size(1289, 793);
this.Controls.Add(this.label2);
this.Controls.Add(this.textBox1);
this.Controls.Add(this.textBox2);
@@ -123,6 +130,7 @@
this.Controls.Add(this.button2);
this.Controls.Add(this.label1);
this.Controls.Add(this.pictureBox1);
+ this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.Name = "FrmLogin";
this.Text = "登录";
this.Load += new System.EventHandler(this.FrmLogin_Load);
diff --git a/InjectionSearch/Form1.cs b/InjectionSearch/Form1.cs
index 3b738ab..5f45c7f 100644
--- a/InjectionSearch/Form1.cs
+++ b/InjectionSearch/Form1.cs
@@ -18,6 +18,7 @@ namespace InjectionSearch
public FrmLogin()
{
InitializeComponent();
+ StartPosition = FormStartPosition.CenterScreen;
}
private void button1_Click(object sender, EventArgs e)
@@ -66,7 +67,7 @@ namespace InjectionSearch
DataTable dt = bll.SearchInfoByNameAndPsw(textBox1.Text.Trim(), stationID, textBox2.Text.Trim());
if (dt != null && dt.Rows.Count > 0)
{
- Form fr = new FrmBarCodeSearch();
+ Form fr = new FrmBarCodeSearch2408();
fr.Show();
this.Hide();
}
diff --git a/InjectionSearch/FrmBarCodeReplace.Designer.cs b/InjectionSearch/FrmBarCodeReplace.Designer.cs
new file mode 100644
index 0000000..919df0f
--- /dev/null
+++ b/InjectionSearch/FrmBarCodeReplace.Designer.cs
@@ -0,0 +1,153 @@
+
+namespace InjectionSearch
+{
+ partial class FrmBarCodeReplace
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.label1 = new System.Windows.Forms.Label();
+ this.lbBoxCode = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
+ this.label3 = new System.Windows.Forms.Label();
+ this.lbOldCode = new System.Windows.Forms.Label();
+ this.txtNewCode = new System.Windows.Forms.TextBox();
+ this.btnOK = new System.Windows.Forms.Button();
+ this.btnClose = new System.Windows.Forms.Button();
+ this.SuspendLayout();
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Font = new System.Drawing.Font("宋体", 16.125F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label1.Location = new System.Drawing.Point(215, 127);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(127, 43);
+ this.label1.TabIndex = 0;
+ this.label1.Text = "箱码:";
+ //
+ // lbBoxCode
+ //
+ this.lbBoxCode.AutoSize = true;
+ this.lbBoxCode.Font = new System.Drawing.Font("宋体", 16.125F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbBoxCode.Location = new System.Drawing.Point(360, 127);
+ this.lbBoxCode.Name = "lbBoxCode";
+ this.lbBoxCode.Size = new System.Drawing.Size(63, 43);
+ this.lbBoxCode.TabIndex = 1;
+ this.lbBoxCode.Text = " ";
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Font = new System.Drawing.Font("宋体", 16.125F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label2.Location = new System.Drawing.Point(129, 235);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(213, 43);
+ this.label2.TabIndex = 2;
+ this.label2.Text = "不良条码:";
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Font = new System.Drawing.Font("宋体", 16.125F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label3.Location = new System.Drawing.Point(172, 370);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(170, 43);
+ this.label3.TabIndex = 3;
+ this.label3.Text = "新条码:";
+ //
+ // lbOldCode
+ //
+ this.lbOldCode.AutoSize = true;
+ this.lbOldCode.Font = new System.Drawing.Font("宋体", 16.125F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbOldCode.Location = new System.Drawing.Point(360, 235);
+ this.lbOldCode.Name = "lbOldCode";
+ this.lbOldCode.Size = new System.Drawing.Size(63, 43);
+ this.lbOldCode.TabIndex = 4;
+ this.lbOldCode.Text = " ";
+ //
+ // txtNewCode
+ //
+ this.txtNewCode.Font = new System.Drawing.Font("宋体", 16.125F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtNewCode.Location = new System.Drawing.Point(368, 367);
+ this.txtNewCode.Name = "txtNewCode";
+ this.txtNewCode.Size = new System.Drawing.Size(682, 57);
+ this.txtNewCode.TabIndex = 5;
+ //
+ // btnOK
+ //
+ this.btnOK.Font = new System.Drawing.Font("宋体", 16.125F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnOK.Location = new System.Drawing.Point(273, 618);
+ this.btnOK.Name = "btnOK";
+ this.btnOK.Size = new System.Drawing.Size(211, 109);
+ this.btnOK.TabIndex = 6;
+ this.btnOK.Text = "替换";
+ this.btnOK.UseVisualStyleBackColor = true;
+ this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
+ //
+ // btnClose
+ //
+ this.btnClose.Font = new System.Drawing.Font("宋体", 16.125F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnClose.Location = new System.Drawing.Point(809, 618);
+ this.btnClose.Name = "btnClose";
+ this.btnClose.Size = new System.Drawing.Size(211, 109);
+ this.btnClose.TabIndex = 7;
+ this.btnClose.Text = "取消";
+ this.btnClose.UseVisualStyleBackColor = true;
+ this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
+ //
+ // FrmBarCodeReplace
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1418, 859);
+ this.Controls.Add(this.btnClose);
+ this.Controls.Add(this.btnOK);
+ this.Controls.Add(this.txtNewCode);
+ this.Controls.Add(this.lbOldCode);
+ this.Controls.Add(this.label3);
+ this.Controls.Add(this.label2);
+ this.Controls.Add(this.lbBoxCode);
+ this.Controls.Add(this.label1);
+ this.Name = "FrmBarCodeReplace";
+ this.Text = "不良零件替换";
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.Label lbBoxCode;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.Label lbOldCode;
+ private System.Windows.Forms.TextBox txtNewCode;
+ private System.Windows.Forms.Button btnOK;
+ private System.Windows.Forms.Button btnClose;
+ }
+}
\ No newline at end of file
diff --git a/InjectionSearch/FrmBarCodeReplace.cs b/InjectionSearch/FrmBarCodeReplace.cs
new file mode 100644
index 0000000..28ebf81
--- /dev/null
+++ b/InjectionSearch/FrmBarCodeReplace.cs
@@ -0,0 +1,125 @@
+using MESClassLibrary.BLL.BasicInfo;
+using MESClassLibrary.BLL.Injection;
+using MESClassLibrary.BLL.Inspection;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace InjectionSearch
+{
+ public partial class FrmBarCodeReplace : Form
+ {
+ private BarCodeBLL _barCodeBLL = new BarCodeBLL();
+ private InjectionBoxBLL _injectionBoxBLL = new InjectionBoxBLL();
+ private BadInjectionBLL _badInjectionBLL = new BadInjectionBLL();
+ private WmsBLL wmsBLL = new WmsBLL();
+
+ public FrmBarCodeReplace(DataRow barCodeRow)
+ {
+ InitializeComponent();
+ this.StartPosition = FormStartPosition.CenterParent;
+ lbBoxCode.Text = barCodeRow["BoxNo"].ToString();
+ lbOldCode.Text = barCodeRow["OneBarCode"].ToString();
+ }
+
+ private void btnOK_Click(object sender, EventArgs e)
+ {
+ try
+ {
+ string newCode = txtNewCode.Text?.Trim();
+ string oldCode = lbOldCode.Text?.Trim();
+ string boxCode = lbBoxCode.Text?.Trim();
+ if (string.IsNullOrEmpty(newCode))
+ {
+ MessageBox.Show("新条码不能为空.");
+ return;
+ }
+
+
+ DataTable dt = _barCodeBLL.SearchBarCodeByOne(newCode);
+ if (dt.Rows.Count == 0)
+ {
+ MessageBox.Show($"输入条码{newCode}在系统中不存在.");
+ return;
+ }
+ if (dt.Rows[0]["IsBad"].ToString() == "1")
+ {
+ MessageBox.Show($"输入条码{newCode}已报废,无法使用.");
+ return;
+ }
+ if (!string.IsNullOrEmpty(dt.Rows[0]["BoxNo"].ToString()))
+ {
+ MessageBox.Show($"输入条码{newCode}已绑定箱码{dt.Rows[0]["BoxNo"].ToString()},无法使用.");
+ return;
+ }
+
+ DataTable oldTable = _barCodeBLL.SearchBarCodeByOne(oldCode);
+ if (oldTable.Rows.Count == 0)
+ {
+ MessageBox.Show($"原有条码{oldCode}在系统中不存在.");
+ return;
+ }
+ string boxNo = oldTable.Rows[0]["BoxNo"].ToString();
+ if (string.IsNullOrEmpty(boxNo))
+ {
+ MessageBox.Show($"不良条码{oldCode}未绑定箱码,无法替换.");
+ return;
+ }
+ if (oldTable.Rows[0]["PartNo"].ToString()?.ToLower() != dt.Rows[0]["PartNo"].ToString()?.ToLower())
+ {
+ MessageBox.Show($"新零件号{oldTable.Rows[0]["PartNo"].ToString()}与原零件号{dt.Rows[0]["PartNo"].ToString()}不一致,无法替换.");
+ return;
+ }
+ //打印箱码才能替换
+ if( wmsBLL.IsSendPackageCode(boxCode) == false)
+ {
+ MessageBox.Show($"箱码{boxCode}尚未报工,无法此处替换.");
+ return;
+ }
+
+ DialogResult result = MessageBox.Show($"确认用条码{newCode}替换原有条码{oldCode},确认将原有条码{oldCode}进行报废处理？", "提示", MessageBoxButtons.OKCancel,
+ MessageBoxIcon.Information);
+ if (result == DialogResult.Cancel) return;
+
+
+ //新条码更新箱码
+ //旧条码清空箱码,IsBad=1
+ //旧条码插入tb_Bad_Injection表报废记录
+ //_barCodeBLL.UpdateBoxNoByID(oldTable.Rows[0]["TableName"].ToString(), boxNo, dt.Rows[0]["ID"].ToString());
+
+ //_barCodeBLL.UpdateBoxNoNull(oldTable.Rows[0]["TableName"].ToString(), oldTable.Rows[0]["ID"].ToString());
+
+ BadInjectionModel model = new BadInjectionModel();
+ model.ID = Guid.NewGuid().ToString();
+ model.OneBarCode = oldTable.Rows[0]["OneBarCode"].ToString();
+ model.BarCode = oldTable.Rows[0]["BarCode"].ToString();
+ model.StationID = oldTable.Rows[0]["StationID"].ToString();
+ model.BadPosition = "";
+ model.BadReason = "不良替换自动报废";
+ model.PlanID = oldTable.Rows[0]["PlanID"].ToString();
+ //_badInjectionBLL.Add_Info(model);
+ _barCodeBLL.BarCodeReplace(oldTable.Rows[0]["TableName"].ToString(), dt.Rows[0]["TableName"].ToString(), boxNo, oldTable.Rows[0]["ID"].ToString(), dt.Rows[0]["ID"].ToString(), dt.Rows[0]["OneBarCode"].ToString(), dt.Rows[0]["BarCode"].ToString(), model);
+
+ MessageBox.Show($"替换成功.原条码[{oldCode}]已被报废.");
+ this.Close();
+ }
+ catch(Exception ex)
+ {
+ MessageBox.Show("操作失败,失败原因:" + ex.Message);
+ }
+
+ }
+
+ private void btnClose_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
+ }
+}
diff --git a/InjectionSearch/FrmBarCodeReplace.resx b/InjectionSearch/FrmBarCodeReplace.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/InjectionSearch/FrmBarCodeReplace.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/InjectionSearch/FrmBarCodeSearch2408.Designer.cs b/InjectionSearch/FrmBarCodeSearch2408.Designer.cs
new file mode 100644
index 0000000..3cefe0c
--- /dev/null
+++ b/InjectionSearch/FrmBarCodeSearch2408.Designer.cs
@@ -0,0 +1,662 @@
+namespace InjectionSearch
+{
+ partial class FrmBarCodeSearch2408
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ GlacialComponents.Controls.GLColumn glColumn1 = new GlacialComponents.Controls.GLColumn();
+ GlacialComponents.Controls.GLColumn glColumn2 = new GlacialComponents.Controls.GLColumn();
+ GlacialComponents.Controls.GLColumn glColumn3 = new GlacialComponents.Controls.GLColumn();
+ GlacialComponents.Controls.GLColumn glColumn4 = new GlacialComponents.Controls.GLColumn();
+ this.label1 = new System.Windows.Forms.Label();
+ this.comboBox1 = new System.Windows.Forms.ComboBox();
+ this.label2 = new System.Windows.Forms.Label();
+ this.textBox1 = new System.Windows.Forms.TextBox();
+ this.textBox2 = new System.Windows.Forms.TextBox();
+ this.label3 = new System.Windows.Forms.Label();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.cboxHandBox = new System.Windows.Forms.CheckBox();
+ this.comboBox2 = new System.Windows.Forms.ComboBox();
+ this.label7 = new System.Windows.Forms.Label();
+ this.label16 = new System.Windows.Forms.Label();
+ this.label5 = new System.Windows.Forms.Label();
+ this.textBox4 = new System.Windows.Forms.TextBox();
+ this.label4 = new System.Windows.Forms.Label();
+ this.textBox3 = new System.Windows.Forms.TextBox();
+ this.label19 = new System.Windows.Forms.Label();
+ this.label11 = new System.Windows.Forms.Label();
+ this.label10 = new System.Windows.Forms.Label();
+ this.panel3 = new System.Windows.Forms.Panel();
+ this.btnBoxRePrint = new System.Windows.Forms.Button();
+ this.btnPackage = new System.Windows.Forms.Button();
+ this.button1 = new System.Windows.Forms.Button();
+ this.label6 = new System.Windows.Forms.Label();
+ this.textBox5 = new System.Windows.Forms.TextBox();
+ this.glacialList1 = new GlacialComponents.Controls.GlacialList();
+ this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+ this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel();
+ this.comBoxSizeL = new System.Windows.Forms.ComboBox();
+ this.label38 = new System.Windows.Forms.Label();
+ this.lbPackageCodeL = new System.Windows.Forms.Label();
+ this.pnBoxReprint = new System.Windows.Forms.Panel();
+ this.btnPrintCancel = new System.Windows.Forms.Button();
+ this.btnRePrint = new System.Windows.Forms.Button();
+ this.txtRePrintBoxCode = new System.Windows.Forms.TextBox();
+ this.label24 = new System.Windows.Forms.Label();
+ this.panel1.SuspendLayout();
+ this.panel3.SuspendLayout();
+ this.tableLayoutPanel1.SuspendLayout();
+ this.groupBox2.SuspendLayout();
+ this.tableLayoutPanel4.SuspendLayout();
+ this.pnBoxReprint.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
+ this.label1.Location = new System.Drawing.Point(180, 118);
+ this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(202, 58);
+ this.label1.TabIndex = 0;
+ this.label1.Text = "产品：";
+ //
+ // comboBox1
+ //
+ this.comboBox1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
+ this.comboBox1.FormattingEnabled = true;
+ this.comboBox1.Location = new System.Drawing.Point(444, 114);
+ this.comboBox1.Margin = new System.Windows.Forms.Padding(6);
+ this.comboBox1.Name = "comboBox1";
+ this.comboBox1.Size = new System.Drawing.Size(1250, 66);
+ this.comboBox1.TabIndex = 1;
+ this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
+ this.label2.Location = new System.Drawing.Point(170, 218);
+ this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(261, 58);
+ this.label2.TabIndex = 2;
+ this.label2.Text = "零件号：";
+ //
+ // textBox1
+ //
+ this.textBox1.Enabled = false;
+ this.textBox1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
+ this.textBox1.Location = new System.Drawing.Point(444, 202);
+ this.textBox1.Margin = new System.Windows.Forms.Padding(6);
+ this.textBox1.Name = "textBox1";
+ this.textBox1.Size = new System.Drawing.Size(474, 74);
+ this.textBox1.TabIndex = 3;
+ //
+ // textBox2
+ //
+ this.textBox2.Enabled = false;
+ this.textBox2.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
+ this.textBox2.Location = new System.Drawing.Point(444, 304);
+ this.textBox2.Margin = new System.Windows.Forms.Padding(6);
+ this.textBox2.Name = "textBox2";
+ this.textBox2.Size = new System.Drawing.Size(1250, 74);
+ this.textBox2.TabIndex = 4;
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
+ this.label3.Location = new System.Drawing.Point(180, 326);
+ this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(202, 58);
+ this.label3.TabIndex = 5;
+ this.label3.Text = "原料：";
+ //
+ // panel1
+ //
+ this.panel1.BackColor = System.Drawing.Color.Aquamarine;
+ this.panel1.Controls.Add(this.cboxHandBox);
+ this.panel1.Controls.Add(this.comboBox2);
+ this.panel1.Controls.Add(this.label7);
+ this.panel1.Controls.Add(this.label16);
+ this.panel1.Controls.Add(this.label5);
+ this.panel1.Controls.Add(this.textBox4);
+ this.panel1.Controls.Add(this.label4);
+ this.panel1.Controls.Add(this.textBox3);
+ this.panel1.Controls.Add(this.label1);
+ this.panel1.Controls.Add(this.label3);
+ this.panel1.Controls.Add(this.comboBox1);
+ this.panel1.Controls.Add(this.textBox2);
+ this.panel1.Controls.Add(this.label2);
+ this.panel1.Controls.Add(this.textBox1);
+ this.panel1.Location = new System.Drawing.Point(370, 1082);
+ this.panel1.Margin = new System.Windows.Forms.Padding(6);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(2008, 634);
+ this.panel1.TabIndex = 6;
+ //
+ // cboxHandBox
+ //
+ this.cboxHandBox.AutoSize = true;
+ this.cboxHandBox.Checked = true;
+ this.cboxHandBox.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.cboxHandBox.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
+ this.cboxHandBox.Location = new System.Drawing.Point(1394, 32);
+ this.cboxHandBox.Margin = new System.Windows.Forms.Padding(4);
+ this.cboxHandBox.Name = "cboxHandBox";
+ this.cboxHandBox.Size = new System.Drawing.Size(293, 62);
+ this.cboxHandBox.TabIndex = 15;
+ this.cboxHandBox.Tag = "true";
+ this.cboxHandBox.Text = "打印箱码";
+ this.cboxHandBox.UseVisualStyleBackColor = true;
+ //
+ // comboBox2
+ //
+ this.comboBox2.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
+ this.comboBox2.FormattingEnabled = true;
+ this.comboBox2.Location = new System.Drawing.Point(444, 16);
+ this.comboBox2.Margin = new System.Windows.Forms.Padding(6);
+ this.comboBox2.Name = "comboBox2";
+ this.comboBox2.Size = new System.Drawing.Size(408, 66);
+ this.comboBox2.TabIndex = 12;
+ //
+ // label7
+ //
+ this.label7.AutoSize = true;
+ this.label7.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
+ this.label7.Location = new System.Drawing.Point(180, 32);
+ this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(202, 58);
+ this.label7.TabIndex = 11;
+ this.label7.Text = "机台：";
+ //
+ // label16
+ //
+ this.label16.AutoSize = true;
+ this.label16.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label16.Location = new System.Drawing.Point(980, 420);
+ this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label16.Name = "label16";
+ this.label16.Size = new System.Drawing.Size(265, 58);
+ this.label16.TabIndex = 10;
+ this.label16.Text = "(yyMMdd)";
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
+ this.label5.Location = new System.Drawing.Point(172, 518);
+ this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(202, 58);
+ this.label5.TabIndex = 8;
+ this.label5.Text = "数量：";
+ //
+ // textBox4
+ //
+ this.textBox4.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
+ this.textBox4.Location = new System.Drawing.Point(444, 518);
+ this.textBox4.Margin = new System.Windows.Forms.Padding(6);
+ this.textBox4.Name = "textBox4";
+ this.textBox4.Size = new System.Drawing.Size(474, 74);
+ this.textBox4.TabIndex = 9;
+ this.textBox4.Text = "10";
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
+ this.label4.Location = new System.Drawing.Point(160, 438);
+ this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(261, 58);
+ this.label4.TabIndex = 6;
+ this.label4.Text = "批次号：";
+ //
+ // textBox3
+ //
+ this.textBox3.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
+ this.textBox3.Location = new System.Drawing.Point(444, 414);
+ this.textBox3.Margin = new System.Windows.Forms.Padding(6);
+ this.textBox3.Name = "textBox3";
+ this.textBox3.Size = new System.Drawing.Size(474, 74);
+ this.textBox3.TabIndex = 7;
+ //
+ // label19
+ //
+ this.label19.BackColor = System.Drawing.Color.DeepSkyBlue;
+ this.label19.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.label19.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label19.Location = new System.Drawing.Point(2372, 1082);
+ this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label19.Name = "label19";
+ this.label19.Size = new System.Drawing.Size(144, 632);
+ this.label19.TabIndex = 17;
+ this.label19.Text = "打印条码";
+ this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ this.label19.Click += new System.EventHandler(this.label19_Click);
+ //
+ // label11
+ //
+ this.label11.BackColor = System.Drawing.Color.DeepSkyBlue;
+ this.label11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.label11.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label11.Location = new System.Drawing.Point(4, 1082);
+ this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label11.Name = "label11";
+ this.label11.Size = new System.Drawing.Size(362, 632);
+ this.label11.TabIndex = 18;
+ this.label11.Text = "打印信息：";
+ this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // label10
+ //
+ this.label10.BackColor = System.Drawing.Color.DeepSkyBlue;
+ this.label10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.label10.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.label10.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label10.Location = new System.Drawing.Point(6, 0);
+ this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label10.Name = "label10";
+ this.label10.Size = new System.Drawing.Size(350, 596);
+ this.label10.TabIndex = 19;
+ this.label10.Text = "打印记录：";
+ this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // panel3
+ //
+ this.panel3.BackColor = System.Drawing.SystemColors.Control;
+ this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.panel3.Controls.Add(this.btnBoxRePrint);
+ this.panel3.Controls.Add(this.btnPackage);
+ this.panel3.Controls.Add(this.button1);
+ this.panel3.Controls.Add(this.label6);
+ this.panel3.Controls.Add(this.textBox5);
+ this.panel3.Location = new System.Drawing.Point(4, 4);
+ this.panel3.Margin = new System.Windows.Forms.Padding(6);
+ this.panel3.Name = "panel3";
+ this.panel3.Size = new System.Drawing.Size(2498, 120);
+ this.panel3.TabIndex = 22;
+ //
+ // btnBoxRePrint
+ //
+ this.btnBoxRePrint.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
+ this.btnBoxRePrint.Location = new System.Drawing.Point(332, 6);
+ this.btnBoxRePrint.Margin = new System.Windows.Forms.Padding(6);
+ this.btnBoxRePrint.Name = "btnBoxRePrint";
+ this.btnBoxRePrint.Size = new System.Drawing.Size(310, 100);
+ this.btnBoxRePrint.TabIndex = 8;
+ this.btnBoxRePrint.Text = "箱码补打";
+ this.btnBoxRePrint.UseVisualStyleBackColor = true;
+ this.btnBoxRePrint.Click += new System.EventHandler(this.btnBoxRePrint_Click);
+ //
+ // btnPackage
+ //
+ this.btnPackage.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
+ this.btnPackage.Location = new System.Drawing.Point(10, 6);
+ this.btnPackage.Margin = new System.Windows.Forms.Padding(6);
+ this.btnPackage.Name = "btnPackage";
+ this.btnPackage.Size = new System.Drawing.Size(310, 100);
+ this.btnPackage.TabIndex = 7;
+ this.btnPackage.Text = "不良替换";
+ this.btnPackage.UseVisualStyleBackColor = true;
+ this.btnPackage.Click += new System.EventHandler(this.btnPackage_Click);
+ //
+ // button1
+ //
+ this.button1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
+ this.button1.Location = new System.Drawing.Point(2148, 20);
+ this.button1.Margin = new System.Windows.Forms.Padding(6);
+ this.button1.Name = "button1";
+ this.button1.Size = new System.Drawing.Size(190, 86);
+ this.button1.TabIndex = 6;
+ this.button1.Text = "查询";
+ this.button1.UseVisualStyleBackColor = true;
+ this.button1.Click += new System.EventHandler(this.button1_Click);
+ //
+ // label6
+ //
+ this.label6.AutoSize = true;
+ this.label6.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
+ this.label6.Location = new System.Drawing.Point(954, 24);
+ this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(261, 58);
+ this.label6.TabIndex = 4;
+ this.label6.Text = "条码号：";
+ //
+ // textBox5
+ //
+ this.textBox5.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
+ this.textBox5.Location = new System.Drawing.Point(1252, 18);
+ this.textBox5.Margin = new System.Windows.Forms.Padding(6);
+ this.textBox5.Name = "textBox5";
+ this.textBox5.Size = new System.Drawing.Size(826, 74);
+ this.textBox5.TabIndex = 5;
+ //
+ // glacialList1
+ //
+ this.glacialList1.AllowColumnResize = true;
+ this.glacialList1.AllowMultiselect = false;
+ this.glacialList1.AlternateBackground = System.Drawing.Color.DarkGreen;
+ this.glacialList1.AlternatingColors = false;
+ this.glacialList1.AutoHeight = true;
+ this.glacialList1.BackColor = System.Drawing.SystemColors.ControlLightLight;
+ this.glacialList1.BackgroundStretchToFit = true;
+ glColumn1.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None;
+ glColumn1.CheckBoxes = false;
+ glColumn1.ImageIndex = -1;
+ glColumn1.Name = "Column1";
+ glColumn1.NumericSort = false;
+ glColumn1.Text = "条码";
+ glColumn1.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+ glColumn1.Width = 300;
+ glColumn2.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None;
+ glColumn2.CheckBoxes = false;
+ glColumn2.ImageIndex = -1;
+ glColumn2.Name = "Column2";
+ glColumn2.NumericSort = false;
+ glColumn2.Text = "产品名称";
+ glColumn2.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+ glColumn2.Width = 450;
+ glColumn3.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None;
+ glColumn3.CheckBoxes = false;
+ glColumn3.ImageIndex = -1;
+ glColumn3.Name = "Column3";
+ glColumn3.NumericSort = false;
+ glColumn3.Text = "打印方式";
+ glColumn3.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+ glColumn3.Width = 80;
+ glColumn4.ActivatedEmbeddedType = GlacialComponents.Controls.GLActivatedEmbeddedTypes.None;
+ glColumn4.CheckBoxes = false;
+ glColumn4.ImageIndex = -1;
+ glColumn4.Name = "Column4";
+ glColumn4.NumericSort = false;
+ glColumn4.Text = "打印时间";
+ glColumn4.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
+ glColumn4.Width = 220;
+ this.glacialList1.Columns.AddRange(new GlacialComponents.Controls.GLColumn[] {
+ glColumn1,
+ glColumn2,
+ glColumn3,
+ glColumn4});
+ this.glacialList1.ControlStyle = GlacialComponents.Controls.GLControlStyles.Normal;
+ this.glacialList1.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.glacialList1.FullRowSelect = true;
+ this.glacialList1.GridColor = System.Drawing.Color.DeepSkyBlue;
+ this.glacialList1.GridLines = GlacialComponents.Controls.GLGridLines.gridBoth;
+ this.glacialList1.GridLineStyle = GlacialComponents.Controls.GLGridLineStyles.gridSolid;
+ this.glacialList1.GridTypes = GlacialComponents.Controls.GLGridTypes.gridNormal;
+ this.glacialList1.HeaderHeight = 40;
+ this.glacialList1.HeaderVisible = true;
+ this.glacialList1.HeaderWordWrap = false;
+ this.glacialList1.HotColumnTracking = false;
+ this.glacialList1.HotItemTracking = false;
+ this.glacialList1.HotTrackingColor = System.Drawing.Color.LightGray;
+ this.glacialList1.HoverEvents = false;
+ this.glacialList1.HoverTime = 1;
+ this.glacialList1.ImageList = null;
+ this.glacialList1.ItemHeight = 39;
+ this.glacialList1.ItemWordWrap = false;
+ this.glacialList1.Location = new System.Drawing.Point(370, 130);
+ this.glacialList1.Margin = new System.Windows.Forms.Padding(6);
+ this.glacialList1.Name = "glacialList1";
+ this.glacialList1.Selectable = true;
+ this.glacialList1.SelectedTextColor = System.Drawing.Color.White;
+ this.glacialList1.SelectionColor = System.Drawing.Color.Lime;
+ this.glacialList1.ShowBorder = true;
+ this.glacialList1.ShowFocusRect = false;
+ this.glacialList1.Size = new System.Drawing.Size(2148, 946);
+ this.glacialList1.SortType = GlacialComponents.Controls.SortTypes.InsertionSort;
+ this.glacialList1.SuperFlatHeaderColor = System.Drawing.Color.White;
+ this.glacialList1.TabIndex = 23;
+ this.glacialList1.Text = "glacialList1";
+ //
+ // tableLayoutPanel1
+ //
+ this.tableLayoutPanel1.ColumnCount = 1;
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+ this.tableLayoutPanel1.Controls.Add(this.groupBox2, 0, 1);
+ this.tableLayoutPanel1.Controls.Add(this.label10, 0, 0);
+ this.tableLayoutPanel1.Location = new System.Drawing.Point(4, 134);
+ this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4);
+ this.tableLayoutPanel1.Name = "tableLayoutPanel1";
+ this.tableLayoutPanel1.RowCount = 2;
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 63.3705F));
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 36.6295F));
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(362, 942);
+ this.tableLayoutPanel1.TabIndex = 24;
+ //
+ // groupBox2
+ //
+ this.groupBox2.BackColor = System.Drawing.Color.Aquamarine;
+ this.groupBox2.Controls.Add(this.tableLayoutPanel4);
+ this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.groupBox2.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Bold);
+ this.groupBox2.Location = new System.Drawing.Point(4, 600);
+ this.groupBox2.Margin = new System.Windows.Forms.Padding(4);
+ this.groupBox2.Name = "groupBox2";
+ this.groupBox2.Padding = new System.Windows.Forms.Padding(4);
+ this.groupBox2.Size = new System.Drawing.Size(354, 338);
+ this.groupBox2.TabIndex = 20;
+ this.groupBox2.TabStop = false;
+ this.groupBox2.Text = "装箱信息";
+ //
+ // tableLayoutPanel4
+ //
+ this.tableLayoutPanel4.ColumnCount = 2;
+ this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 40F));
+ this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 60F));
+ this.tableLayoutPanel4.Controls.Add(this.comBoxSizeL, 1, 1);
+ this.tableLayoutPanel4.Controls.Add(this.label38, 0, 1);
+ this.tableLayoutPanel4.Controls.Add(this.lbPackageCodeL, 0, 0);
+ this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 36);
+ this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4);
+ this.tableLayoutPanel4.Name = "tableLayoutPanel4";
+ this.tableLayoutPanel4.RowCount = 2;
+ this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 49.99751F));
+ this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0025F));
+ this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F));
+ this.tableLayoutPanel4.Size = new System.Drawing.Size(346, 298);
+ this.tableLayoutPanel4.TabIndex = 3;
+ //
+ // comBoxSizeL
+ //
+ this.comBoxSizeL.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.comBoxSizeL.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.comBoxSizeL.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.comBoxSizeL.FormattingEnabled = true;
+ this.comBoxSizeL.Items.AddRange(new object[] {
+ "A班",
+ "B班"});
+ this.comBoxSizeL.Location = new System.Drawing.Point(144, 187);
+ this.comBoxSizeL.Margin = new System.Windows.Forms.Padding(6);
+ this.comBoxSizeL.Name = "comBoxSizeL";
+ this.comBoxSizeL.Size = new System.Drawing.Size(182, 72);
+ this.comBoxSizeL.TabIndex = 3;
+ //
+ // label38
+ //
+ this.label38.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.label38.BackColor = System.Drawing.Color.Transparent;
+ this.label38.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label38.Location = new System.Drawing.Point(6, 196);
+ this.label38.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label38.Name = "label38";
+ this.label38.Size = new System.Drawing.Size(116, 54);
+ this.label38.TabIndex = 1;
+ this.label38.Text = "规格:";
+ this.label38.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // lbPackageCodeL
+ //
+ this.lbPackageCodeL.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.lbPackageCodeL.AutoSize = true;
+ this.tableLayoutPanel4.SetColumnSpan(this.lbPackageCodeL, 2);
+ this.lbPackageCodeL.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lbPackageCodeL.Location = new System.Drawing.Point(4, 55);
+ this.lbPackageCodeL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbPackageCodeL.Name = "lbPackageCodeL";
+ this.lbPackageCodeL.Size = new System.Drawing.Size(0, 37);
+ this.lbPackageCodeL.TabIndex = 5;
+ //
+ // pnBoxReprint
+ //
+ this.pnBoxReprint.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.pnBoxReprint.Controls.Add(this.btnPrintCancel);
+ this.pnBoxReprint.Controls.Add(this.btnRePrint);
+ this.pnBoxReprint.Controls.Add(this.txtRePrintBoxCode);
+ this.pnBoxReprint.Controls.Add(this.label24);
+ this.pnBoxReprint.Location = new System.Drawing.Point(560, 426);
+ this.pnBoxReprint.Margin = new System.Windows.Forms.Padding(5);
+ this.pnBoxReprint.Name = "pnBoxReprint";
+ this.pnBoxReprint.Size = new System.Drawing.Size(1397, 150);
+ this.pnBoxReprint.TabIndex = 25;
+ this.pnBoxReprint.Visible = false;
+ //
+ // btnPrintCancel
+ //
+ this.btnPrintCancel.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnPrintCancel.Location = new System.Drawing.Point(1197, 44);
+ this.btnPrintCancel.Margin = new System.Windows.Forms.Padding(5);
+ this.btnPrintCancel.Name = "btnPrintCancel";
+ this.btnPrintCancel.Size = new System.Drawing.Size(160, 60);
+ this.btnPrintCancel.TabIndex = 3;
+ this.btnPrintCancel.Text = "取消";
+ this.btnPrintCancel.UseVisualStyleBackColor = true;
+ this.btnPrintCancel.Click += new System.EventHandler(this.btnPrintCancel_Click);
+ //
+ // btnRePrint
+ //
+ this.btnRePrint.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnRePrint.Location = new System.Drawing.Point(1027, 40);
+ this.btnRePrint.Margin = new System.Windows.Forms.Padding(5);
+ this.btnRePrint.Name = "btnRePrint";
+ this.btnRePrint.Size = new System.Drawing.Size(160, 60);
+ this.btnRePrint.TabIndex = 2;
+ this.btnRePrint.Text = "确定";
+ this.btnRePrint.UseVisualStyleBackColor = true;
+ this.btnRePrint.Click += new System.EventHandler(this.btnRePrint_Click);
+ //
+ // txtRePrintBoxCode
+ //
+ this.txtRePrintBoxCode.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtRePrintBoxCode.Location = new System.Drawing.Point(208, 44);
+ this.txtRePrintBoxCode.Margin = new System.Windows.Forms.Padding(5);
+ this.txtRePrintBoxCode.Name = "txtRePrintBoxCode";
+ this.txtRePrintBoxCode.Size = new System.Drawing.Size(737, 55);
+ this.txtRePrintBoxCode.TabIndex = 1;
+ //
+ // label24
+ //
+ this.label24.AutoSize = true;
+ this.label24.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.label24.Location = new System.Drawing.Point(27, 52);
+ this.label24.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label24.Name = "label24";
+ this.label24.Size = new System.Drawing.Size(190, 42);
+ this.label24.TabIndex = 0;
+ this.label24.Text = "箱单号：";
+ this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+ //
+ // FrmBarCodeSearch2408
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(2528, 1638);
+ this.Controls.Add(this.pnBoxReprint);
+ this.Controls.Add(this.tableLayoutPanel1);
+ this.Controls.Add(this.glacialList1);
+ this.Controls.Add(this.panel3);
+ this.Controls.Add(this.label11);
+ this.Controls.Add(this.label19);
+ this.Controls.Add(this.panel1);
+ this.Margin = new System.Windows.Forms.Padding(6);
+ this.Name = "FrmBarCodeSearch2408";
+ this.Text = "条码信息";
+ this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmBarCodeSearch_FormClosing);
+ this.Load += new System.EventHandler(this.FrmBarCodeSearch_Load);
+ this.panel1.ResumeLayout(false);
+ this.panel1.PerformLayout();
+ this.panel3.ResumeLayout(false);
+ this.panel3.PerformLayout();
+ this.tableLayoutPanel1.ResumeLayout(false);
+ this.groupBox2.ResumeLayout(false);
+ this.tableLayoutPanel4.ResumeLayout(false);
+ this.tableLayoutPanel4.PerformLayout();
+ this.pnBoxReprint.ResumeLayout(false);
+ this.pnBoxReprint.PerformLayout();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.ComboBox comboBox1;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.TextBox textBox1;
+ private System.Windows.Forms.TextBox textBox2;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.Panel panel1;
+ private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.TextBox textBox4;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.TextBox textBox3;
+ private System.Windows.Forms.Label label16;
+ private System.Windows.Forms.Label label19;
+ private System.Windows.Forms.Label label11;
+ private System.Windows.Forms.Label label10;
+ private System.Windows.Forms.Panel panel3;
+ private System.Windows.Forms.Button button1;
+ private System.Windows.Forms.Label label6;
+ private System.Windows.Forms.TextBox textBox5;
+ private GlacialComponents.Controls.GlacialList glacialList1;
+ private System.Windows.Forms.ComboBox comboBox2;
+ private System.Windows.Forms.Label label7;
+ private System.Windows.Forms.Button btnPackage;
+ private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
+ private System.Windows.Forms.GroupBox groupBox2;
+ private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4;
+ public System.Windows.Forms.ComboBox comBoxSizeL;
+ private System.Windows.Forms.Label label38;
+ private System.Windows.Forms.Label lbPackageCodeL;
+ private System.Windows.Forms.CheckBox cboxHandBox;
+ private System.Windows.Forms.Button btnBoxRePrint;
+ private System.Windows.Forms.Panel pnBoxReprint;
+ private System.Windows.Forms.Button btnPrintCancel;
+ private System.Windows.Forms.Button btnRePrint;
+ private System.Windows.Forms.TextBox txtRePrintBoxCode;
+ private System.Windows.Forms.Label label24;
+ }
+}
\ No newline at end of file
diff --git a/InjectionSearch/FrmBarCodeSearch2408.cs b/InjectionSearch/FrmBarCodeSearch2408.cs
new file mode 100644
index 0000000..1b083cd
--- /dev/null
+++ b/InjectionSearch/FrmBarCodeSearch2408.cs
@@ -0,0 +1,1272 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Configuration;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using grproLib;
+using MESClassLibrary.BLL;
+using MESClassLibrary.BLL.BasicInfo;
+using MESClassLibrary.BLL.Injection;
+using MESClassLibrary.BLL.Inspection;
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.BLL.TruckBox;
+using MESClassLibrary.DAL;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using DataTable = System.Data.DataTable;
+
+namespace InjectionSearch
+{
+ public partial class FrmBarCodeSearch2408 : Form
+ {
+ private UniqueBll _uniqueBll = new UniqueBll();
+ private BasicBLL1 _basicBLL1 = new BasicBLL1();
+ private InjectionBoxBLL _injectionBoxBLL = new InjectionBoxBLL();
+ private BarCodeBLL _bll = new BarCodeBLL();
+ private WmsBLL _wmsBll = new WmsBLL();
+ private string _lastBoxNo = string.Empty;
+ public FrmBarCodeSearch2408()
+ {
+ InitializeComponent();
+ }
+
+ private void initProduct()
+ {
+ comboBox1.Items.Clear();
+
+ ProductBLL bll = new ProductBLL();
+
+ DataTable dt = bll.SearchInfoAllByType("2000");
+ if (dt != null && dt.Rows.Count > 0)
+ {
+ for (int i = 0; i < dt.Rows.Count; i++)
+ {
+ comboBox1.Items.Add(dt.Rows[i]["StockNo"].ToString() +"--"+dt.Rows[i]["ProductName"].ToString());
+ }
+ }
+ dt.Dispose();
+ }
+
+ private void initBarCode()
+ {
+ BarCodeBLL bll = new BarCodeBLL();
+
+ glacialList1.Items.Clear();
+ DataTable dt = bll.SearchBarCode();
+ if (dt != null && dt.Rows.Count > 0)
+ {
+ for (int i = 0; i < dt.Rows.Count; i++)
+ {
+ glacialList1.Items.Add(i.ToString());
+ glacialList1.Items[i].SubItems[0].Text = dt.Rows[i]["BarCode"].ToString();
+ glacialList1.Items[i].SubItems[1].Text = dt.Rows[i]["ProductName"].ToString();
+ glacialList1.Items[i].SubItems[2].Text = dt.Rows[i]["PrintType"].ToString();
+ glacialList1.Items[i].SubItems[3].Text = dt.Rows[i]["CreateTime"].ToString() == "" ? "" : Convert.ToDateTime(dt.Rows[i]["CreateTime"].ToString()).ToString("yyyy-MM-dd HH:mm:ss.fff");
+ //glacialList1.Items[i].SubItems[4].Text = dt.Rows[i]["MaterialName"].ToString();
+ //glacialList1.Items[i].SubItems[5].Text = dt.Rows[i]["BatchNo"].ToString();
+ glacialList1.Items[i].SubItems[0].Tag = dt.Rows[i]["BoxNo"].ToString();
+ glacialList1.Items[i].SubItems[1].Tag = dt.Rows[i]["TableName"].ToString();
+ }
+ }
+ }
+
+ private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ string stockNo = comboBox1.Text.Substring(0, 10);
+
+ ProductBLL bll=new ProductBLL();
+ BomBLL bombll=new BomBLL();
+
+ DataTable dt = bll.SearchInfoByStock(stockNo);
+ if (dt != null && dt.Rows.Count > 0)
+ {
+ textBox1.Text = dt.Rows[0]["PartNo"].ToString();
+ dt.Dispose();
+ }
+ else
+ {
+ textBox1.Text = "";
+ }
+
+ DataTable dt1 = bombll.SearchBom(textBox1.Text);
+ if (dt1 != null && dt1.Rows.Count > 0)
+ {
+ textBox2.Text = dt1.Rows[0]["PartNo2"].ToString();
+ dt.Dispose();
+ }
+ else
+ {
+ textBox2.Text = "";
+ }
+ }
+
+ private void FrmBarCodeSearch_Load(object sender, EventArgs e)
+ {
+ initProduct();
+ initBarCode();
+ comboBox2.Items.Clear();
+ comboBox2.Items.Add("IM01");
+ comboBox2.Items.Add("IM02");
+ comboBox2.Items.Add("IM03");
+ comboBox2.Items.Add("IM04");
+ comboBox2.Items.Add("IM05");
+ comboBox2.Items.Add("IM06");
+ comboBox2.Items.Add("IM07");
+ comboBox2.Items.Add("IM08");
+ comboBox2.Items.Add("IM09");
+ comboBox2.Items.Add("IM10");
+ comboBox2.Items.Add("IM11");
+ comboBox2.Items.Add("IM12");
+ comboBox2.Items.Add("IM13");
+ comboBox2.Items.Add("IM14");
+ comboBox2.Items.Add("IM15");
+ comboBox2.Items.Add("IM16");
+ comboBox2.Items.Add("IM17");
+ comboBox2.Items.Add("IM18");
+ comboBox2.Items.Add("IM19");
+ comboBox2.Items.Add("IM20");
+ GetClass();
+ textBox3.Text = Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) +
+ Program.ProductDate.Substring(8, 2); //批次
+
+ comBoxSizeL.DataSource = _basicBLL1.GetPackageSize();
+ comBoxSizeL.DisplayMember = "describe";
+ comBoxSizeL.ValueMember = "Count";
+ }
+
+ private void GetClass()
+ {
+ try
+ {
+ DateTime aa = GetDateTime();
+
+ if (GetDateTime().Hour >= 8 && GetDateTime().Hour < 20)
+ {
+ Program.Shift = "A班";
+ Program.ProductDate = aa.ToString("yyyy-MM-dd");
+
+ }
+ else
+ {
+ Program.Shift = "B班";
+ if (GetDateTime().Hour >= 0 && GetDateTime().Hour < 8)
+ {
+ Program.ProductDate = aa.AddDays(-1).ToString("yyyy-MM-dd");
+ }
+ else
+ {
+ Program.ProductDate = aa.ToString("yyyy-MM-dd");
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ }
+ }
+
+ private void label18_Click(object sender, EventArgs e)
+ {
+ string code = "",name="";
+ BarCodeModel md = new BarCodeModel();
+ BarCodeBLL bll = new BarCodeBLL();
+ ProductBLL pbll=new ProductBLL();
+ string filename = "", partNo = "", OneCode="";
+
+ try
+ {
+ if (glacialList1.SelectedItems.Count == 0)
+ {
+ MessageBox.Show("请选择要补打的条码!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ return;
+ }
+ else
+ {
+ GlacialComponents.Controls.GLItem gv;
+ gv = glacialList1.SelectedItems[0] as GlacialComponents.Controls.GLItem;
+ code = gv.Text;
+
+ string[] aa = code.Split('.');
+ partNo = aa[0];
+
+ DataTable dt = bll.SearchInfoByBarCode(code);
+ if (dt != null && dt.Rows.Count > 0)
+ {
+ name = dt.Rows[0]["ProductName"].ToString();
+ md.ID = Guid.NewGuid().ToString();
+ md.BarCode = code;
+ md.StationID = Program.StationID;
+ md.StockNo = dt.Rows[0]["StockNo"].ToString();
+ md.OneBarCode = dt.Rows[0]["OneBarCode"].ToString();
+ md.StationID2 = dt.Rows[0]["StationID"].ToString();
+ md.PrintType = 2;
+
+ DataTable pdt = pbll.SearchIsImportByStockNo(md.StockNo);
+ if (pdt != null && pdt.Rows.Count > 0)
+ {
+ if (pdt.Rows[0]["isImport"].ToString() == "1")
+ {
+ md.Import = "国产料Kingfa";
+ }
+ else
+ {
+ md.Import = "";
+ }
+ }
+ }
+
+ //if (bll.Add_Info_New(md, "tb_BarCode5") == false)
+ //{
+ // return;
+ //}
+ if (SaveBarCode(md, "tb_BarCode5", false) == false)
+ {
+ return;
+ }
+ #region 打印条码
+ PlasticBLL plbll = new PlasticBLL();
+
+ filename = System.AppDomain.CurrentDomain.BaseDirectory + "单个条码.grf";
+ DataTable headTable = new DataTable();
+ headTable.Columns.Add("PrintTime");
+ headTable.Columns.Add("PartNo");
+ headTable.Columns.Add("PartName");
+ headTable.Columns.Add("OneBarCode");
+ headTable.Columns.Add("BarCode");
+ DataRow row = headTable.NewRow();
+ row["PrintTime"] = GetDateTime().ToString("yyyy/MM/dd HH:mm:ss");
+ row["PartNo"] = partNo;
+ row["PartName"] = name;
+ row["OneBarCode"] = md.OneBarCode;
+ row["BarCode"] = code;
+
+
+ string reportName = ConfigurationManager.AppSettings["Printer1"].ToString();
+ headTable.Rows.Add(row);
+
+ ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName);
+
+ rp.Report.Print(false);
+
+ #endregion
+
+ initBarCode();
+ }
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ }
+
+ }
+
+ public DateTime GetDateTime()
+ {
+ string sql = "";
+ DateTime time;
+ DataTable dt;
+ try
+ {
+ sql = @"select getdate() as time";
+
+ dt = SqlHelper.ExecuteDataset(SqlHelper.GetConnSting(), CommandType.Text, sql, null).Tables[0];
+ if (dt != null && dt.Rows.Count > 0)
+ {
+ time = Convert.ToDateTime(dt.Rows[0]["time"].ToString());
+
+ }
+ else
+ {
+ time = DateTime.Now;
+ }
+ return time;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return DateTime.Now;
+ }
+ }
+
+ private static bool IsNumeric(string str)
+ {
+ System.Text.RegularExpressions.Regex reg1 = new System.Text.RegularExpressions.Regex(@"^[0-9]\d*$");
+ return reg1.IsMatch(str);
+ }
+
+ private void label19_Click(object sender, EventArgs e)
+ {
+ string code = "", stationID = "", OneCode = "",planID="";
+ string newcode = "", partNo = "", stockNo = "", NewOneCode = "";
+ string filename = "", printName = "", PartName = "", IsSupply="",QLevel="",ProductNature="",IsPrint="";
+
+ ProductBLL pbll = new ProductBLL();
+ BarCodeBLL bll = new BarCodeBLL();
+ BarCodeModel md = new BarCodeModel();
+ InjectionPlanBLL planbll = new InjectionPlanBLL();
+
+ try
+ {
+
+
+ #region 数据合法性判断
+ if (comboBox2.Text.Trim() == "")
+ {
+ MessageBox.Show("请选择机台!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ return;
+ }
+
+ if (comboBox1.Text.Trim() == "")
+ {
+ MessageBox.Show("请选择产品!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ return;
+ }
+
+ if (textBox3.Text.Trim() == "")
+ {
+ MessageBox.Show("请输入批次!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ return;
+ }
+
+ if (textBox4.Text.Trim() == "")
+ {
+ MessageBox.Show("请输入数量!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ return;
+ }
+ if (!IsNumeric(textBox4.Text.Trim()))
+ {
+ MessageBox.Show("数量格式不正确!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ return;
+ }
+
+ if (Convert.ToInt32(textBox4.Text.Trim()) > 100)
+ {
+ MessageBox.Show("数量不能大于100!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ return;
+ }
+
+ #endregion
+
+ #region 获取工位编号
+
+ StationBLL sbll = new StationBLL();
+ DataTable sdt = sbll.SearchInfoByNo(comboBox2.Text.Trim());
+ if (sdt != null && sdt.Rows.Count > 0)
+ {
+ stationID = sdt.Rows[0]["StationID"].ToString();
+ }
+ sdt.Dispose();
+ #endregion
+
+ #region 获取对应工位的当前计划信息
+
+
+ DataTable plandt = planbll.SearchInfoByName(comboBox2.Text);
+ if (plandt != null && plandt.Rows.Count > 0)
+ {
+ planID = plandt.Rows[0]["InjectionPlanID"].ToString();
+ ProductNature = plandt.Rows[0]["ProductNature"].ToString();
+ }
+
+ #endregion
+ int packageSize = 0;
+ string msg = "确定手工打印条码？";
+ if (cboxHandBox.Checked)
+ {
+ if (comBoxSizeL.SelectedItem == null)
+ {
+ MessageBox.Show("选中打印箱码,请先选择箱码规格!");
+ return;
+ }
+ else
+ {
+ string size = comBoxSizeL.SelectedValue.ToString();
+ int.TryParse(size, out packageSize);
+
+ int allCount = Convert.ToInt32(textBox4.Text.Trim());
+ int i = allCount % packageSize;
+
+ if(i > 0)
+ {
+ msg = $"最后一箱数量为[{i}],不能满箱打印,是否确定手工打印条码？";
+
+ }
+ }
+ }
+ DialogResult result = MessageBox.Show(msg, "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Information);
+ if (result == DialogResult.OK)
+ {
+ //查询零件号
+ stockNo = comboBox1.Text.Substring(0, 10);
+ partNo = textBox1.Text.Trim();
+
+ #region 判断零件是否是直供件、是否打印标签
+
+ ProductBLL prbll = new ProductBLL();
+ DataTable prdt = prbll.SearchInfoByPartNo(partNo);
+ if (prdt != null && prdt.Rows.Count > 0)
+ {
+ IsSupply = prdt.Rows[0]["IsSupply"].ToString();
+ QLevel = prdt.Rows[0]["QLevel"].ToString();
+ IsPrint = prdt.Rows[0]["IsPrintOneTag"].ToString();
+ }
+
+ #endregion
+
+ #region 非直供件
+
+ if (IsSupply != "1")
+ {
+ for (int i = 1; i <= Convert.ToInt32(textBox4.Text.Trim()); i++)
+ {
+ DataTable pdt = pbll.SearchIsImportByStockNo(stockNo);
+ string packageCode = string.Empty;
+ if (cboxHandBox.Checked)
+ {
+ if( i% packageSize == 1)
+ {
+ packageCode = SaveBoxInfo(pdt, partNo, textBox3.Text.Trim(), packageSize.ToString());
+
+ if(string.IsNullOrEmpty(packageCode))
+ {
+ MessageBox.Show("箱单生成失败,请重新操作!");
+ return;
+ }
+ else
+ {
+ packageCode = lbPackageCodeL.Text.Trim();
+ }
+ if (string.IsNullOrEmpty(packageCode))
+ {
+ MessageBox.Show("箱单生成失败,请重新操作!");
+ return;
+ }
+ }
+ else
+ {
+ packageCode = lbPackageCodeL.Text.Trim();
+ }
+ if (string.IsNullOrEmpty(packageCode))
+ {
+ MessageBox.Show("箱单生成失败,请重新操作!");
+ return;
+ }
+ }
+
+ GetSjBarCode(stockNo, partNo,false, ref NewOneCode, ref newcode);
+ string[] part = newcode.Split('.');
+ //存入tb_BarCode表
+ md.ID = Guid.NewGuid().ToString();
+ md.StationID = Program.StationID;
+ md.StationID2 = stationID;
+ md.StockNo = stockNo;
+ md.OneBarCode = NewOneCode;
+ md.BarCode = newcode;
+ md.PrintType = 1;
+ md.PartNo = partNo;
+ md.PlanID = planID;
+ md.ProductNature = ProductNature;
+ md.BoxNo = packageCode;
+
+ if (pdt != null && pdt.Rows.Count > 0)
+ {
+ PartName = pdt.Rows[0]["ProductName"].ToString();
+ if (pdt.Rows[0]["isImport"].ToString() == "1")
+ {
+ md.Import = "国产料Kingfa";
+ }
+ else
+ {
+ md.Import = "";
+ }
+ }
+
+ //if (bll.Add_Info_New(md, "tb_BarCode5") == false)
+ //{
+ // return;
+ //}
+ if(SaveBarCode(md, "tb_BarCode5", i== Convert.ToInt32(textBox4.Text.Trim())) == false)
+ {
+ return;
+ }
+
+ #region 214TrunkBox存入质检表
+
+ if (partNo == "A2146106203kz")
+ {
+ tb_Inspection_tx imd = new tb_Inspection_tx();
+ InspectionBLL ibll = new InspectionBLL();
+
+ imd.BarCode = NewOneCode;
+ imd.IsOK = 1;
+ imd.Station = 1;
+
+ ibll.AddInfo(imd);
+ }
+
+ #endregion
+
+ if (IsPrint == "1")
+ {
+ #region 打印条码
+
+ filename = System.AppDomain.CurrentDomain.BaseDirectory + "单个条码.grf";
+ DataTable headTable = new DataTable();
+ headTable.Columns.Add("PrintTime");
+ headTable.Columns.Add("PartNo");
+ headTable.Columns.Add("PartName");
+ headTable.Columns.Add("OneBarCode");
+ headTable.Columns.Add("BarCode");
+ DataRow row = headTable.NewRow();
+ row["PrintTime"] = GetDateTime().ToString("yyyy/MM/dd HH:mm:ss");
+ row["PartNo"] = partNo;
+ row["PartName"] = PartName;
+ row["OneBarCode"] = NewOneCode;
+ row["BarCode"] = newcode;
+ string reportName = ConfigurationManager.AppSettings["Printer1"].ToString();
+ headTable.Rows.Add(row);
+
+ ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName);
+
+ rp.Report.Print(false);
+
+ #endregion
+ }
+ }
+
+ #region 原有打印代码
+ //DataTable dt = bll.SearchSerialNoByBarCodeNew(partNo + "." + textBox3.Text.Trim(),"");
+ //if (dt != null && dt.Rows.Count > 0)
+ //{
+ // OneCode = dt.Rows[0]["OneBarCode"].ToString().Trim();
+ // code = dt.Rows[0]["BarCode"].ToString().TrimEnd();
+ // for (int i = 1; i <= Convert.ToInt32(textBox4.Text.Trim()); i++)
+ // {
+ // //newcode = code.Substring(0, code.Length - 4) +
+ // // (Convert.ToInt32(code.Substring(code.Length - 4, 4)) + i)
+ // // .ToString()
+ // // .PadLeft(4, '0');
+ // //NewOneCode = OneCode.Substring(0, OneCode.Length - 4) +
+ // // (Convert.ToInt32(OneCode.Substring(OneCode.Length - 4, 4)) + i).ToString()
+ // // .PadLeft(4, '0');
+
+ // GetSjBarCode(stockNo, partNo, ref NewOneCode, ref newcode);
+ // string[] part = newcode.Split('.');
+ // //存入tb_BarCode表
+ // md.ID = Guid.NewGuid().ToString();
+ // md.StationID = Program.StationID;
+ // md.StationID2 = stationID;
+ // md.StockNo = stockNo;
+ // md.OneBarCode = NewOneCode;
+ // md.BarCode = newcode;
+ // md.PrintType = 1;
+ // md.PartNo = partNo;
+ // md.PlanID = planID;
+ // md.ProductNature = ProductNature;
+
+ // DataTable pdt = pbll.SearchIsImportByStockNo(stockNo);
+ // if (pdt != null && pdt.Rows.Count > 0)
+ // {
+ // PartName = pdt.Rows[0]["ProductName"].ToString();
+ // if (pdt.Rows[0]["isImport"].ToString() == "1")
+ // {
+ // md.Import = "国产料Kingfa";
+ // }
+ // else
+ // {
+ // md.Import = "";
+ // }
+ // }
+
+ // if (bll.Add_Info_New(md, "tb_BarCode5") == false)
+ // {
+ // return;
+ // }
+
+ // #region 214TrunkBox存入质检表
+
+ // if (partNo == "A2146106203kz")
+ // {
+ // tb_Inspection_tx imd = new tb_Inspection_tx();
+ // InspectionBLL ibll = new InspectionBLL();
+
+ // imd.BarCode = NewOneCode;
+ // imd.IsOK =1;
+ // imd.Station = 1;
+
+ // ibll.AddInfo(imd);
+ // }
+
+ // #endregion
+
+ // if (IsPrint == "1")
+ // {
+ // #region 打印条码
+
+ // filename = System.AppDomain.CurrentDomain.BaseDirectory + "单个条码.grf";
+ // DataTable headTable = new DataTable();
+ // headTable.Columns.Add("PrintTime");
+ // headTable.Columns.Add("PartNo");
+ // headTable.Columns.Add("PartName");
+ // headTable.Columns.Add("OneBarCode");
+ // headTable.Columns.Add("BarCode");
+ // DataRow row = headTable.NewRow();
+ // row["PrintTime"] = GetDateTime().ToString("yyyy/MM/dd HH:mm:ss");
+ // row["PartNo"] = partNo;
+ // row["PartName"] = PartName;
+ // row["OneBarCode"] = NewOneCode;
+ // row["BarCode"] = newcode;
+ // string reportName = ConfigurationManager.AppSettings["Printer1"].ToString();
+ // headTable.Rows.Add(row);
+
+ // ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName);
+
+ // rp.Report.Print(false);
+
+ // #endregion
+ // }
+ // }
+ //}
+ //else
+ //{
+ // for (int i = 1; i <= Convert.ToInt32(textBox4.Text.Trim()); i++)
+ // {
+ // newcode = partNo + "." + textBox3.Text.Trim() + "." + i.ToString().PadLeft(4, '0');
+ // NewOneCode = stockNo + textBox3.Text.Trim() + i.ToString().PadLeft(4, '0');
+ // string[] part = newcode.Split('.');
+ // //存入tb_BarCode表
+ // md.ID = Guid.NewGuid().ToString();
+ // md.StationID = Program.StationID;
+ // md.StationID2 = stationID;
+ // md.StockNo = stockNo;
+ // md.OneBarCode = NewOneCode;
+ // md.BarCode = newcode;
+ // md.PrintType = 1;
+ // md.PartNo = partNo;
+ // md.PlanID = planID;
+ // md.ProductNature = ProductNature;
+
+ // DataTable pdt = pbll.SearchIsImportByStockNo(stockNo);
+ // if (pdt != null && pdt.Rows.Count > 0)
+ // {
+ // PartName = pdt.Rows[0]["ProductName"].ToString();
+ // if (pdt.Rows[0]["isImport"].ToString() == "1")
+ // {
+ // md.Import = "国产料Kingfa";
+ // }
+ // else
+ // {
+ // md.Import = "";
+ // }
+ // }
+
+ // if (bll.Add_Info_New(md, "tb_BarCode5") == false)
+ // {
+ // return;
+ // }
+
+ // #region 214TrunkBox存入质检表
+
+ // if (partNo == "A2146106203kz")
+ // {
+ // tb_Inspection_tx imd = new tb_Inspection_tx();
+ // InspectionBLL ibll = new InspectionBLL();
+
+ // imd.BarCode = NewOneCode;
+ // imd.IsOK = 1;
+ // imd.Station = 1;
+
+ // ibll.AddInfo(imd);
+ // }
+
+ // #endregion
+
+ // if (IsPrint == "1")
+ // {
+ // #region 打印条码
+
+ // filename = System.AppDomain.CurrentDomain.BaseDirectory + "单个条码.grf";
+ // DataTable headTable = new DataTable();
+ // headTable.Columns.Add("PrintTime");
+ // headTable.Columns.Add("PartNo");
+ // headTable.Columns.Add("PartName");
+ // headTable.Columns.Add("OneBarCode");
+ // headTable.Columns.Add("BarCode");
+ // DataRow row = headTable.NewRow();
+ // row["PrintTime"] = GetDateTime().ToString("yyyy/MM/dd HH:mm:ss");
+ // row["PartNo"] = partNo;
+ // row["PartName"] = PartName;
+ // row["OneBarCode"] = NewOneCode;
+ // row["BarCode"] = newcode;
+
+ // string reportName = ConfigurationManager.AppSettings["Printer1"].ToString();
+ // headTable.Rows.Add(row);
+
+ // ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName);
+
+ // rp.Report.Print(false);
+
+ // #endregion
+ // }
+ // }
+ //}
+ #endregion
+ }
+
+ #endregion
+
+ #region 直供件
+
+ if (IsSupply == "1")
+ {
+
+ for (int i = 1; i <= Convert.ToInt32(textBox4.Text.Trim()); i++)
+ {
+ //newcode = partNo + "#" + QLevel + "#" + textBox3.Text.Trim() + "#" +
+ // i.ToString().PadLeft(3, '0') + "#";
+
+ DataTable pdt = pbll.SearchIsImportByStockNo(stockNo);
+ string packageCode = string.Empty;
+ if (cboxHandBox.Checked)
+ {
+ if (i % packageSize == 1)
+ {
+ packageCode = SaveBoxInfo(pdt, partNo, textBox3.Text.Trim(), packageSize.ToString());
+
+ if (string.IsNullOrEmpty(packageCode))
+ {
+ MessageBox.Show("箱单生成失败,请重新操作!");
+ return;
+ }
+ }
+ else
+ {
+ packageCode = lbPackageCodeL.Text.Trim();
+ }
+ if(string.IsNullOrEmpty(packageCode))
+ {
+ MessageBox.Show("箱单生成失败,请重新操作!");
+ return;
+ }
+ }
+
+
+ NewOneCode = "";
+ //直供件不生成NewOneCode 此处也生成一个,可以不用
+ GetSjBarCode(stockNo, partNo, false, ref NewOneCode, ref newcode);
+
+ GetSupplyCode(partNo, QLevel,true, ref newcode);
+
+ string[] part = newcode.Split('.');
+
+ #region 存入tb_BarCode表
+
+ md.ID = Guid.NewGuid().ToString();
+ md.StationID = Program.StationID;
+ md.StationID2 = stationID;
+ md.StockNo = stockNo;
+ md.OneBarCode = NewOneCode;
+ md.BarCode = newcode;
+ md.PrintType = 1;
+ md.PartNo = partNo;
+ md.PlanID = planID;
+ md.ProductNature = ProductNature;
+ md.BoxNo = packageCode;
+ // DataTable pdt = pbll.SearchIsImportByStockNo(stockNo);
+ if (pdt != null && pdt.Rows.Count > 0)
+ {
+ if (pdt.Rows[0]["isImport"].ToString() == "1")
+ {
+ md.Import = "国产料Kingfa";
+ }
+ else
+ {
+ md.Import = "";
+ }
+ }
+
+ //if (bll.Add_Info_New(md, "tb_BarCode5") == false)
+ //{
+ // return;
+ //}
+ if (SaveBarCode(md, "tb_BarCode5", i == Convert.ToInt32(textBox4.Text.Trim())) == false)
+ {
+ return;
+ }
+ #endregion
+
+
+ if (IsPrint == "1")
+ {
+ #region 打印条码
+
+ filename = System.AppDomain.CurrentDomain.BaseDirectory +
+ "单个条码1.grf";
+
+ DataTable headTable = new DataTable();
+ headTable.Columns.Add("PrintTime");
+ headTable.Columns.Add("PartNo");
+ headTable.Columns.Add("PartName");
+ headTable.Columns.Add("OneBarCode");
+ headTable.Columns.Add("BarCode");
+ DataRow row = headTable.NewRow();
+ row["PrintTime"] = GetDateTime().ToString("yyyy/MM/dd HH:mm:ss");
+ row["PartNo"] = partNo;
+ row["PartName"] = PartName;
+ row["OneBarCode"] = NewOneCode;
+ row["BarCode"] = newcode;
+ string reportName = ConfigurationManager.AppSettings["Printer1"].ToString();
+ headTable.Rows.Add(row);
+
+ ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName);
+
+ rp.Report.Print(false);
+
+ #endregion
+ }
+ }
+
+ #region 原来打印代码
+ //DataTable dt = bll.SearchSerialNoByBarCodeNew1(partNo + "#" + QLevel + "#" + textBox3.Text.Trim() + "#");
+ //if (dt != null && dt.Rows.Count > 0)
+ //{
+ // code = dt.Rows[0]["BarCode"].ToString().Trim();
+ // for (int i = 1; i <= Convert.ToInt32(textBox2.Text.Trim()); i++)
+ // {
+ // newcode = code.Substring(0, code.Length - 4) +
+ // (Convert.ToInt32(code.Substring(23, 3)) +
+ // i).ToString()
+ // .PadLeft(3, '0') + "#";
+
+ // #region 插入数据tb_barCode
+
+ // md.ID = Guid.NewGuid().ToString();
+ // md.StationID = Program.StationID;
+ // md.StationID2 = stationID;
+ // md.StockNo = stockNo;
+ // md.OneBarCode = "";
+ // md.BarCode = newcode;
+ // md.PrintType = 1;
+ // md.PartNo = partNo;
+
+ // md.PlanID = planID;
+ // md.ProductNature = ProductNature;
+
+ // DataTable dt2 = pbll.SearchIsImportByPartNo(partNo);
+ // if (dt2 != null && dt2.Rows.Count > 0)
+ // {
+ // if (dt2.Rows[0]["isImport"].ToString() == "1")
+ // {
+ // md.Import = "国产料Kingfa";
+ // }
+ // else
+ // {
+ // md.Import = "";
+ // }
+ // }
+
+ // if (bll.Add_Info_New(md, "tb_BarCode5") == false)
+ // {
+ // return;
+ // }
+
+ // #endregion
+
+ // if (IsPrint == "1")
+ // {
+ // #region 打印条码
+
+ // filename = System.AppDomain.CurrentDomain.BaseDirectory +
+ // "单个条码1.grf";
+
+ // DataTable headTable = new DataTable();
+ // headTable.Columns.Add("PrintTime");
+ // headTable.Columns.Add("PartNo");
+ // headTable.Columns.Add("PartName");
+ // headTable.Columns.Add("OneBarCode");
+ // headTable.Columns.Add("BarCode");
+ // DataRow row = headTable.NewRow();
+ // row["PrintTime"] = GetDateTime().ToString("yyyy/MM/dd HH:mm:ss");
+ // row["PartNo"] = partNo;
+ // row["PartName"] = PartName;
+ // row["OneBarCode"] = NewOneCode;
+ // row["BarCode"] = newcode;
+ // string reportName = ConfigurationManager.AppSettings["Printer1"].ToString();
+ // headTable.Rows.Add(row);
+
+ // ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName);
+
+ // rp.Report.Print(false);
+
+ // #endregion
+ // }
+ // }
+ //}
+ //else
+ //{
+ // for (int i = 1; i <= Convert.ToInt32(textBox4.Text.Trim()); i++)
+ // {
+ // newcode = partNo + "#" + QLevel + "#" + textBox3.Text.Trim() + "#" +
+ // i.ToString().PadLeft(3, '0') + "#";
+ // NewOneCode = "";
+ // string[] part = newcode.Split('.');
+
+ // #region 存入tb_BarCode表
+
+ // md.ID = Guid.NewGuid().ToString();
+ // md.StationID = Program.StationID;
+ // md.StationID2 = stationID;
+ // md.StockNo = stockNo;
+ // md.OneBarCode = NewOneCode;
+ // md.BarCode = newcode;
+ // md.PrintType = 1;
+ // md.PartNo = partNo;
+ // md.PlanID = planID;
+ // md.ProductNature = ProductNature;
+
+ // DataTable pdt = pbll.SearchIsImportByStockNo(stockNo);
+ // if (pdt != null && pdt.Rows.Count > 0)
+ // {
+ // if (pdt.Rows[0]["isImport"].ToString() == "1")
+ // {
+ // md.Import = "国产料Kingfa";
+ // }
+ // else
+ // {
+ // md.Import = "";
+ // }
+ // }
+
+ // if (bll.Add_Info_New(md, "tb_BarCode5") == false)
+ // {
+ // return;
+ // }
+
+ // #endregion
+
+
+ // if (IsPrint == "1")
+ // {
+ // #region 打印条码
+
+ // filename = System.AppDomain.CurrentDomain.BaseDirectory +
+ // "单个条码1.grf";
+
+ // DataTable headTable = new DataTable();
+ // headTable.Columns.Add("PrintTime");
+ // headTable.Columns.Add("PartNo");
+ // headTable.Columns.Add("PartName");
+ // headTable.Columns.Add("OneBarCode");
+ // headTable.Columns.Add("BarCode");
+ // DataRow row = headTable.NewRow();
+ // row["PrintTime"] = GetDateTime().ToString("yyyy/MM/dd HH:mm:ss");
+ // row["PartNo"] = partNo;
+ // row["PartName"] = PartName;
+ // row["OneBarCode"] = NewOneCode;
+ // row["BarCode"] = newcode;
+ // string reportName = ConfigurationManager.AppSettings["Printer1"].ToString();
+ // headTable.Rows.Add(row);
+
+ // ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName);
+
+ // rp.Report.Print(false);
+
+ // #endregion
+ // }
+ // }
+ //}
+ #endregion
+ }
+
+ #endregion
+
+ initBarCode();
+ }
+ else
+ {
+ return;
+ }
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ }
+ }
+ string SaveBoxInfo(DataTable pdt, string partNo, string batch,string packageSize)
+ {
+ string packageCode = _uniqueBll.GetPackageCodeSerialNo(partNo, textBox3.Text.Trim(), packageSize.ToString());
+ InjectionBoxModel boxmd = new InjectionBoxModel();
+ boxmd.ID = Guid.NewGuid().ToString();
+ boxmd.BoxNo = packageCode;
+ boxmd.BoxCount = 0;
+ boxmd.BoxType = 0;
+ boxmd.IsFlag = 0;
+ boxmd.StationNo = Program.station;
+ if (pdt != null && pdt.Rows.Count > 0)
+ {
+ boxmd.PartName = pdt.Rows[0]["ProductName"].ToString();
+ }
+
+
+ boxmd.Mould = "2";
+ boxmd.StandardQty = packageSize.ToString();
+ if(_injectionBoxBLL.AddInfo(boxmd))
+ {
+ this.lbPackageCodeL.Text = packageCode;
+ return packageCode;
+ }
+ return null;
+ }
+ bool SaveBarCode(BarCodeModel bcm, string tableName , bool printBox)
+ {
+ bool saveRst = false;
+ if (cboxHandBox.Checked)
+ {
+ saveRst = _bll.Add_Info_New(bcm, "tb_BarCode5");
+ if(saveRst == true)
+ {
+ if (_injectionBoxBLL.UpdateBoxCount(bcm.BoxNo,1))
+ {
+ DataTable dt = _injectionBoxBLL.SearchBox(bcm.BoxNo);
+ if (dt.Rows.Count > 0)
+ {
+ string realCountStr = dt.Rows[0]["BoxCount"].ToString();
+
+ int realCount = 0;
+ int sizeCount = 0;
+ int.TryParse(realCountStr, out realCount);
+ int.TryParse(comBoxSizeL.SelectedValue?.ToString(), out sizeCount);
+ if ((realCount != 0 && realCount == sizeCount) || printBox ==true)
+ {
+ //检查上一个箱码是否给wms传成功了, 没成功重传一次.
+ //if (!string.IsNullOrEmpty(_lastBoxNo))
+ //{
+ // if(_wmsBll.IsSendPackageCode(_lastBoxNo) == false)
+ // {
+ // DataTable dt2 = _injectionBoxBLL.SearchBox(_lastBoxNo);
+ // if(dt2.Rows.Count >0)
+ // {
+ // _wmsBll.SaveInterface(dt2.Rows[0], MESClassLibrary.Enum.WmsInterfaceEnum.塑件箱码报工);
+ // }
+ // }
+ // _lastBoxNo = "";
+
+ //}
+ ////wms接口传递
+ //_wmsBll.SaveInterface(dt.Rows[0], MESClassLibrary.Enum.WmsInterfaceEnum.塑件箱码报工);
+
+ _wmsBll.SaveInterface(dt.Rows[0]["BoxNo"].ToString(), _lastBoxNo, "", MESClassLibrary.Enum.WmsInterfaceEnum.塑件箱码报工);
+
+ //打印箱码
+ PrintBoxCode(dt.Rows[0], realCount,false);
+ _lastBoxNo = lbPackageCodeL.Text;
+ lbPackageCodeL.Text = "";
+ }
+ }
+ }
+ }
+ }
+ else
+ {
+ saveRst = _bll.Add_Info_New(bcm, "tb_BarCode5");
+ }
+ return saveRst;
+ }
+ private void PrintBoxCode(DataRow boxRow, int realCount,bool isRePrint)
+ {
+ string filename = System.AppDomain.CurrentDomain.BaseDirectory + "装箱单.grf";
+ DataTable headTable = new DataTable();
+ headTable.Columns.Add("BoxNo");
+ headTable.Columns.Add("PartName");
+ headTable.Columns.Add("PartNo");
+ headTable.Columns.Add("BatchNo");
+ headTable.Columns.Add("PackCount");
+ headTable.Columns.Add("Line");
+ DataRow row = headTable.NewRow();
+ string boxCode = boxRow["BoxNo"].ToString();
+ string[] boxes = boxCode.Split('.');
+ if (boxes.Length != 4)
+ {
+ //新生成一个箱码 应该都有
+ }
+ else
+ {
+ row["BoxNo"] = boxCode;
+ row["PartNo"] = boxes[0].Trim();
+ row["PartName"] = boxRow["PartName"].ToString();
+ row["BatchNo"] = boxes[1].Trim();
+ row["PackCount"] = realCount;
+ row["Line"] = boxRow["StationNo"].ToString() + "注塑机";
+ }
+ //补打不修改数据状态
+ if(isRePrint == false)
+ {
+ UpdateBoxRecordPrintState(boxCode);
+ }
+
+ string reportName = ConfigurationManager.AppSettings["Printer2"].ToString();
+ headTable.Rows.Add(row);
+
+ ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName);
+
+ rp.Report.Print(false);
+
+
+ }
+ private void UpdateBoxRecordPrintState(string UpdatePrinted)
+ {
+ _injectionBoxBLL.UpdatePrinted(UpdatePrinted);
+ }
+
+ private void button1_Click(object sender, EventArgs e)
+ {
+ BarCodeBLL bll = new BarCodeBLL();
+ DataTable dt = null;
+
+ try
+ {
+ glacialList1.Items.Clear();
+ if (textBox5.Text.Trim() == "")
+ {
+ dt = bll.SearchBarCode();
+ }
+ else
+ {
+ if (textBox5.Text.Trim().Length == 20)
+ {
+ dt = bll.SearchBarCodeByOne(textBox5.Text.Trim());
+ }
+ else
+ {
+ dt = bll.SearchBarCodeByTwo(textBox5.Text.Trim());
+ }
+ }
+
+
+ if (dt != null && dt.Rows.Count > 0)
+ {
+ for (int i = 0; i < dt.Rows.Count; i++)
+ {
+ glacialList1.Items.Add(i.ToString());
+ glacialList1.Items[i].SubItems[0].Text = dt.Rows[i]["BarCode"].ToString();
+ glacialList1.Items[i].SubItems[1].Text = dt.Rows[i]["ProductName"].ToString();
+ glacialList1.Items[i].SubItems[2].Text = dt.Rows[i]["PrintType"].ToString();
+ glacialList1.Items[i].SubItems[3].Text = dt.Rows[i]["PrintTime"].ToString() == "" ? "" : Convert.ToDateTime(dt.Rows[i]["PrintTime"].ToString()).ToString("yyyy-MM-dd HH:mm:ss.fff");
+ glacialList1.Items[i].SubItems[4].Text = dt.Rows[i]["MaterialName"].ToString();
+ glacialList1.Items[i].SubItems[5].Text = dt.Rows[i]["BatchNo"].ToString();
+
+ glacialList1.Items[i].SubItems[0].Tag = dt.Rows[i]["BoxNo"].ToString();
+ glacialList1.Items[i].SubItems[1].Tag = dt.Rows[i]["TableName"].ToString();
+ }
+ }
+
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ }
+ }
+
+ private void FrmBarCodeSearch_FormClosing(object sender, FormClosingEventArgs e)
+ {
+ Application.Exit();
+ }
+
+ void GetSjBarCode(string stockNo, string partNo,bool autoPrint, ref string newOneCode, ref string newCode)
+ {
+ string batch = string.Empty;
+ if (autoPrint)
+ {
+ batch = Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) + Program.ProductDate.Substring(8, 2);
+ }
+ else
+ {
+ batch = textBox3.Text.Trim();
+ }
+
+
+
+ newOneCode = _uniqueBll.GetSjBarCodeSerialNo(stockNo, batch);
+ newCode = partNo + "." + batch + "." + newOneCode.Substring(newOneCode.Length - 4, 4);
+ }
+ void GetSupplyCode(string partNo, string qLevel, bool autoPrint, ref string newCode)
+ {
+ string batch = string.Empty;
+ if (autoPrint)
+ {
+ batch = Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) + Program.ProductDate.Substring(8, 2);
+ }
+ else
+ {
+ batch = textBox3.Text.Trim();
+ }
+ newCode = _uniqueBll.GetSupplySerialNo(partNo, qLevel, batch);
+ }
+
+ private void btnPackage_Click(object sender, EventArgs e)
+ {
+ string boxCode = string.Empty;
+ string tableName = string.Empty;
+ if (glacialList1.SelectedItems.Count > 0)
+ {
+ GlacialComponents.Controls.GLItem gv;
+ gv = glacialList1.SelectedItems[0] as GlacialComponents.Controls.GLItem;
+
+ boxCode = gv.SubItems[0].Tag?.ToString();
+ tableName = gv.SubItems[1].Tag?.ToString();
+ }
+ FrmPackageDetail detail = new FrmPackageDetail(boxCode);
+ detail.ShowDialog();
+ }
+
+ private void btnBoxRePrint_Click(object sender, EventArgs e)
+ {
+ if(pnBoxReprint.Visible == true)
+ {
+ pnBoxReprint.Visible = false;
+ }
+ else
+ {
+ pnBoxReprint.Visible = true;
+ }
+
+ if (glacialList1.SelectedItems.Count > 0)
+ {
+ GlacialComponents.Controls.GLItem gv;
+ gv = glacialList1.SelectedItems[0] as GlacialComponents.Controls.GLItem;
+
+ txtRePrintBoxCode.Text = gv.SubItems[0].Tag?.ToString();
+ txtRePrintBoxCode.SelectAll();
+ }
+ }
+
+ private void btnRePrint_Click(object sender, EventArgs e)
+ {
+ string boxCode = txtRePrintBoxCode.Text?.Trim();
+ if (string.IsNullOrEmpty(boxCode))
+ {
+ MessageBox.Show("请输入箱码");
+ return;
+ }
+ DataTable dt = _injectionBoxBLL.SearchBox(boxCode);
+ if(dt.Rows.Count == 0)
+ {
+ MessageBox.Show($"箱码[{boxCode}]在系统中不存在!");
+ return;
+ }
+ PrintBoxCode(dt.Rows[0], int.Parse(dt.Rows[0]["StandardQty"].ToString()), true);
+
+ }
+
+ private void btnPrintCancel_Click(object sender, EventArgs e)
+ {
+ pnBoxReprint.Visible = false;
+ }
+ }
+}
diff --git a/InjectionSearch/FrmBarCodeSearch2408.resx b/InjectionSearch/FrmBarCodeSearch2408.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/InjectionSearch/FrmBarCodeSearch2408.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/InjectionSearch/FrmPackageDetail.Designer.cs b/InjectionSearch/FrmPackageDetail.Designer.cs
new file mode 100644
index 0000000..f9594fe
--- /dev/null
+++ b/InjectionSearch/FrmPackageDetail.Designer.cs
@@ -0,0 +1,299 @@
+
+namespace InjectionSearch
+{
+ partial class FrmPackageDetail
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
+ this.toolStrip1 = new System.Windows.Forms.ToolStrip();
+ this.txtPackageCode = new System.Windows.Forms.TextBox();
+ this.btnSearch = new System.Windows.Forms.Button();
+ this.dataGridView1 = new System.Windows.Forms.DataGridView();
+ this.dateTimePicker1 = new System.Windows.Forms.DateTimePicker();
+ this.dateTimePicker2 = new System.Windows.Forms.DateTimePicker();
+ this.label1 = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
+ this.label3 = new System.Windows.Forms.Label();
+ this.箱单号 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.条码 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.注塑码 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.零件号 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.不良替换 = new System.Windows.Forms.DataGridViewButtonColumn();
+ this.时间 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.tableLayoutPanel1.SuspendLayout();
+ this.panel1.SuspendLayout();
+ this.tableLayoutPanel2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
+ this.SuspendLayout();
+ //
+ // tableLayoutPanel1
+ //
+ this.tableLayoutPanel1.ColumnCount = 1;
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+ this.tableLayoutPanel1.Controls.Add(this.panel1, 0, 0);
+ this.tableLayoutPanel1.Controls.Add(this.dataGridView1, 0, 1);
+ this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
+ this.tableLayoutPanel1.Name = "tableLayoutPanel1";
+ this.tableLayoutPanel1.RowCount = 3;
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 60F));
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 60F));
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(2331, 1192);
+ this.tableLayoutPanel1.TabIndex = 0;
+ //
+ // panel1
+ //
+ this.panel1.Controls.Add(this.label3);
+ this.panel1.Controls.Add(this.label2);
+ this.panel1.Controls.Add(this.label1);
+ this.panel1.Controls.Add(this.dateTimePicker2);
+ this.panel1.Controls.Add(this.dateTimePicker1);
+ this.panel1.Controls.Add(this.tableLayoutPanel2);
+ this.panel1.Controls.Add(this.txtPackageCode);
+ this.panel1.Controls.Add(this.btnSearch);
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.panel1.Location = new System.Drawing.Point(3, 3);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(2325, 54);
+ this.panel1.TabIndex = 0;
+ //
+ // tableLayoutPanel2
+ //
+ this.tableLayoutPanel2.ColumnCount = 1;
+ this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+ this.tableLayoutPanel2.Controls.Add(this.toolStrip1, 0, 0);
+ this.tableLayoutPanel2.Location = new System.Drawing.Point(3, -3);
+ this.tableLayoutPanel2.Name = "tableLayoutPanel2";
+ this.tableLayoutPanel2.RowCount = 1;
+ this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
+ this.tableLayoutPanel2.Size = new System.Drawing.Size(751, 56);
+ this.tableLayoutPanel2.TabIndex = 2;
+ //
+ // toolStrip1
+ //
+ this.toolStrip1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.toolStrip1.ImageScalingSize = new System.Drawing.Size(32, 32);
+ this.toolStrip1.Location = new System.Drawing.Point(0, 0);
+ this.toolStrip1.Name = "toolStrip1";
+ this.toolStrip1.Size = new System.Drawing.Size(751, 56);
+ this.toolStrip1.TabIndex = 0;
+ this.toolStrip1.Text = "toolStrip1";
+ //
+ // txtPackageCode
+ //
+ this.txtPackageCode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.txtPackageCode.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtPackageCode.Location = new System.Drawing.Point(1771, 5);
+ this.txtPackageCode.Name = "txtPackageCode";
+ this.txtPackageCode.Size = new System.Drawing.Size(373, 44);
+ this.txtPackageCode.TabIndex = 1;
+ //
+ // btnSearch
+ //
+ this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnSearch.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnSearch.Location = new System.Drawing.Point(2173, 0);
+ this.btnSearch.Name = "btnSearch";
+ this.btnSearch.Size = new System.Drawing.Size(153, 51);
+ this.btnSearch.TabIndex = 0;
+ this.btnSearch.Text = "查 询";
+ this.btnSearch.UseVisualStyleBackColor = true;
+ this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
+ //
+ // dataGridView1
+ //
+ this.dataGridView1.AllowUserToAddRows = false;
+ this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+ this.箱单号,
+ this.条码,
+ this.注塑码,
+ this.零件号,
+ this.不良替换,
+ this.时间});
+ dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window;
+ dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText;
+ dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle1;
+ this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.dataGridView1.Location = new System.Drawing.Point(3, 63);
+ this.dataGridView1.Name = "dataGridView1";
+ this.dataGridView1.RowHeadersWidth = 82;
+ this.dataGridView1.RowTemplate.Height = 37;
+ this.dataGridView1.Size = new System.Drawing.Size(2325, 1066);
+ this.dataGridView1.TabIndex = 1;
+ this.dataGridView1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick);
+ //
+ // dateTimePicker1
+ //
+ this.dateTimePicker1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.dateTimePicker1.CustomFormat = "yyyy-MM-dd HH:mm";
+ this.dateTimePicker1.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+ this.dateTimePicker1.Location = new System.Drawing.Point(1082, 10);
+ this.dateTimePicker1.Name = "dateTimePicker1";
+ this.dateTimePicker1.Size = new System.Drawing.Size(264, 35);
+ this.dateTimePicker1.TabIndex = 3;
+ //
+ // dateTimePicker2
+ //
+ this.dateTimePicker2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.dateTimePicker2.CustomFormat = "yyyy-MM-dd HH:mm";
+ this.dateTimePicker2.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
+ this.dateTimePicker2.Location = new System.Drawing.Point(1385, 10);
+ this.dateTimePicker2.Name = "dateTimePicker2";
+ this.dateTimePicker2.Size = new System.Drawing.Size(264, 35);
+ this.dateTimePicker2.TabIndex = 4;
+ //
+ // label1
+ //
+ this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(1353, 16);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(22, 24);
+ this.label1.TabIndex = 5;
+ this.label1.Text = "-";
+ //
+ // label2
+ //
+ this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(1013, 16);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(58, 24);
+ this.label2.TabIndex = 6;
+ this.label2.Text = "时间";
+ //
+ // label3
+ //
+ this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(1702, 14);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(58, 24);
+ this.label3.TabIndex = 7;
+ this.label3.Text = "箱码";
+ //
+ // 箱单号
+ //
+ this.箱单号.DataPropertyName = "BoxNo";
+ this.箱单号.HeaderText = "箱单号";
+ this.箱单号.MinimumWidth = 10;
+ this.箱单号.Name = "箱单号";
+ this.箱单号.Width = 300;
+ //
+ // 条码
+ //
+ this.条码.DataPropertyName = "BarCode";
+ this.条码.HeaderText = "条码";
+ this.条码.MinimumWidth = 10;
+ this.条码.Name = "条码";
+ this.条码.Width = 200;
+ //
+ // 注塑码
+ //
+ this.注塑码.DataPropertyName = "OneBarCode";
+ this.注塑码.HeaderText = "注塑码";
+ this.注塑码.MinimumWidth = 10;
+ this.注塑码.Name = "注塑码";
+ this.注塑码.Width = 200;
+ //
+ // 零件号
+ //
+ this.零件号.DataPropertyName = "PartNo";
+ this.零件号.HeaderText = "零件号";
+ this.零件号.MinimumWidth = 10;
+ this.零件号.Name = "零件号";
+ this.零件号.Width = 150;
+ //
+ // 不良替换
+ //
+ this.不良替换.DataPropertyName = "Replace";
+ this.不良替换.HeaderText = "不良替换";
+ this.不良替换.MinimumWidth = 10;
+ this.不良替换.Name = "不良替换";
+ this.不良替换.Text = "不良替换";
+ this.不良替换.Width = 200;
+ //
+ // 时间
+ //
+ this.时间.DataPropertyName = "CreateTime";
+ this.时间.HeaderText = "时间";
+ this.时间.MinimumWidth = 10;
+ this.时间.Name = "时间";
+ this.时间.Width = 200;
+ //
+ // FrmPackageDetail
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(2331, 1192);
+ this.Controls.Add(this.tableLayoutPanel1);
+ this.Name = "FrmPackageDetail";
+ this.Text = "箱单详细信息";
+ this.tableLayoutPanel1.ResumeLayout(false);
+ this.panel1.ResumeLayout(false);
+ this.panel1.PerformLayout();
+ this.tableLayoutPanel2.ResumeLayout(false);
+ this.tableLayoutPanel2.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
+ private System.Windows.Forms.Panel panel1;
+ private System.Windows.Forms.TextBox txtPackageCode;
+ private System.Windows.Forms.Button btnSearch;
+ private System.Windows.Forms.DataGridView dataGridView1;
+ private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
+ private System.Windows.Forms.ToolStrip toolStrip1;
+ private System.Windows.Forms.DateTimePicker dateTimePicker1;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.DateTimePicker dateTimePicker2;
+ private System.Windows.Forms.DataGridViewTextBoxColumn 箱单号;
+ private System.Windows.Forms.DataGridViewTextBoxColumn 条码;
+ private System.Windows.Forms.DataGridViewTextBoxColumn 注塑码;
+ private System.Windows.Forms.DataGridViewTextBoxColumn 零件号;
+ private System.Windows.Forms.DataGridViewButtonColumn 不良替换;
+ private System.Windows.Forms.DataGridViewTextBoxColumn 时间;
+ }
+}
\ No newline at end of file
diff --git a/InjectionSearch/FrmPackageDetail.cs b/InjectionSearch/FrmPackageDetail.cs
new file mode 100644
index 0000000..bcb5346
--- /dev/null
+++ b/InjectionSearch/FrmPackageDetail.cs
@@ -0,0 +1,77 @@
+using MESClassLibrary.BLL.BasicInfo;
+using MESClassLibrary.BLL.Inspection;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace InjectionSearch
+{
+ public partial class FrmPackageDetail : Form
+ {
+ private BarCodeBLL _barCodeBLL = new BarCodeBLL();
+ private InjectionBoxBLL _injectionBoxBLL = new InjectionBoxBLL();
+ private string _packageCode = string.Empty;
+
+ public FrmPackageDetail(string pPackageCode)
+ {
+ InitializeComponent();
+ this._packageCode = pPackageCode;
+ txtPackageCode.Text = pPackageCode;
+ dataGridView1.AutoGenerateColumns = false;
+ if(!string.IsNullOrEmpty(pPackageCode))
+ btnSearch_Click(null, null);
+ }
+
+ private void btnSearch_Click(object sender, EventArgs e)
+ {
+ string boxCode = txtPackageCode.Text?.Trim();
+
+ string date1 = this.dateTimePicker1.Value.ToString("yyyy-MM-dd 00:00:00");
+ if (string.IsNullOrWhiteSpace(this.dateTimePicker1.Text))
+ {
+ date1 = "1900-01-01 00:00:00";
+ }
+ string date2 = this.dateTimePicker2.Value.ToString("yyyy-MM-dd 23:59:59");
+ if (string.IsNullOrWhiteSpace(this.dateTimePicker2.Text))
+ {
+ date2 = "9999-01-01 00:00:00";
+ }
+
+ string whereStr = $" CreateTime > '{date1}' and CreateTime<'{date2}' ";
+ if (!string.IsNullOrEmpty(txtPackageCode.Text.Trim()))
+ {
+ whereStr = whereStr + $" and BoxNo='{txtPackageCode.Text.Trim()}'";
+ }
+
+ DataTable dt = _barCodeBLL.SearchBarCodeByWhere(whereStr, "v_Code", "200");
+ if (!dt.Columns.Contains("Replace"))
+ {
+ dt.Columns.Add("Replace");
+ }
+ foreach(DataRow dr in dt.Rows)
+ {
+ dr["Replace"] = "不良替换";
+ }
+ dataGridView1.DataSource = dt;
+ }
+
+ private void dataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e)
+ {
+ if (e.RowIndex >= 0 && e.RowIndex != -1 && !dataGridView1.Rows[e.RowIndex].IsNewRow)
+ {
+
+ if (e.ColumnIndex == 4)
+ {
+ DataRow dataRow = (this.dataGridView1[e.ColumnIndex, e.RowIndex].OwningRow.DataBoundItem as DataRowView).Row;
+ FrmBarCodeReplace frm = new FrmBarCodeReplace(dataRow);
+ frm.ShowDialog();
+ }
+ }
+ }
+ }
+}
diff --git a/InjectionSearch/FrmPackageDetail.resx b/InjectionSearch/FrmPackageDetail.resx
new file mode 100644
index 0000000..f18596a
--- /dev/null
+++ b/InjectionSearch/FrmPackageDetail.resx
@@ -0,0 +1,141 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ 17, 17
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
\ No newline at end of file
diff --git a/InjectionSearch/InjectionSearch.csproj b/InjectionSearch/InjectionSearch.csproj
index aadc63c..34dea61 100644
--- a/InjectionSearch/InjectionSearch.csproj
+++ b/InjectionSearch/InjectionSearch.csproj
@@ -71,21 +71,48 @@
Form1.cs
+
+ Form
+
+
+ FrmBarCodeReplace.cs
+
+
+ Form
+
+
+ FrmBarCodeSearch2408.cs
+
Form
FrmBarCodeSearch.cs
+
+ Form
+
+
+ FrmPackageDetail.cs
+
Form1.cs
+
+ FrmBarCodeReplace.cs
+
+
+ FrmBarCodeSearch2408.cs
+
FrmBarCodeSearch.cs
+
+ FrmPackageDetail.cs
+
ResXFileCodeGenerator
Resources.Designer.cs
diff --git a/InjectionSearch/Program.cs b/InjectionSearch/Program.cs
index effe2d2..5dd6614 100644
--- a/InjectionSearch/Program.cs
+++ b/InjectionSearch/Program.cs
@@ -1,7 +1,9 @@
using System;
using System.Collections.Generic;
using System.Data.SqlClient;
+using System.Diagnostics;
using System.Linq;
+using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -31,6 +33,18 @@ namespace InjectionSearch
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
+
+ Application.SetUnhandledExceptionMode(UnhandledExceptionMode.CatchException);
+
+ //处理UI线程异常
+
+ Application.ThreadException += new System.Threading.ThreadExceptionEventHandler(Application_ThreadException);
+
+ //处理非UI线程异常
+
+ AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
+
+
Application.Run(new FrmLogin());
mutex.ReleaseMutex();
}
@@ -39,5 +53,61 @@ namespace InjectionSearch
MessageBox.Show("程序已启动!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
}
+
+ #region 系统异常处理
+ static void Application_ThreadException(object sender, System.Threading.ThreadExceptionEventArgs e)
+ {
+ string str = GetExceptionMsg(e.Exception, e.ToString());
+ MessageBox.Show(str);
+ //LogManager.WriteLog(str);
+ }
+
+
+
+ static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
+ {
+ string str = GetExceptionMsg(e.ExceptionObject as Exception, e.ToString());
+ MessageBox.Show(str);
+ //LogManager.WriteLog(str);
+ }
+ static string GetExceptionMsg(Exception ex, string backStr)
+
+ {
+ StringBuilder sb = new StringBuilder();
+
+ sb.AppendLine("****************************异常文本****************************");
+
+ sb.AppendLine("【出现时间】：" + DateTime.Now.ToString());
+
+ if (ex != null)
+ {
+
+ sb.AppendLine("【异常类型】：" + ex.GetType().Name);
+
+ sb.AppendLine("【异常信息】：" + ex.Message);
+
+ sb.AppendLine("【堆栈调用】：" + ex.StackTrace);
+
+ }
+
+ else
+
+ {
+
+ sb.AppendLine("【未处理异常】：" + backStr);
+
+ }
+
+ sb.AppendLine("***************************************************************");
+
+ return sb.ToString();
+ }
+ private static void ExceptionMonitor_ExceptionOver()
+ {
+ MessageBox.Show("系统遇到未知异常，即将重新启动。");
+ Process.Start(Application.ExecutablePath);
+ Process.GetCurrentProcess().Kill();
+ }
+ #endregion
}
}
diff --git a/InjectionSearch/bin/Debug/装箱单.grf b/InjectionSearch/bin/Debug/装箱单.grf
index eeb1a1f..63d24a5 100644
Binary files a/InjectionSearch/bin/Debug/装箱单.grf and b/InjectionSearch/bin/Debug/装箱单.grf differ
diff --git a/InjectionSearch/装箱单.grf b/InjectionSearch/装箱单.grf
new file mode 100644
index 0000000..63d24a5
Binary files /dev/null and b/InjectionSearch/装箱单.grf differ
diff --git a/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs b/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs
index 4503054..bf05bdf 100644
--- a/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs
+++ b/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs
@@ -6,15 +6,18 @@ using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using MESClassLibrary.BLL.Log;
+using MESClassLibrary.DAL;
using MESClassLibrary.DAL.BasicInfo;
+using MESClassLibrary.DAL.Injection;
using MESClassLibrary.Model;
namespace MESClassLibrary.BLL.BasicInfo
{
public class BarCodeBLL
{
- BarCodeDAl db = new BarCodeDAl();
-
+ private BarCodeDAl db = new BarCodeDAl();
+ private WmsDAL wmsDal = new WmsDAL();
+ private BadInjectionDAL badDb = new BadInjectionDAL();
public DataTable SearchInfoByStock(string StockNo)
{
try
@@ -293,6 +296,47 @@ namespace MESClassLibrary.BLL.BasicInfo
return null;
}
}
+ ///
+ /// 箱码中单个条码替换
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public bool BarCodeReplace(string oldtableName, string newtableName, string boxCode,string oldID,string newID,string newOneBarCode,string newBarCode, BadInjectionModel model)
+ {
+ LocalDBService localDB = new LocalDBService(SqlHelper.GetConnSting());
+ try
+ {
+ localDB.BeginTrans();
+ db.UpdateBoxNoByID(localDB, newtableName, boxCode, newID);
+ db.UpdateBoxNoNull(localDB, oldtableName, oldID);
+ badDb.AddInfo(localDB, model);
+ wmsDal.DeleteRecord(localDB, boxCode, model.OneBarCode, model.BarCode);
+ wmsDal.AddRecord(localDB, boxCode, newOneBarCode, newBarCode);
+ localDB.Commit();
+ return true;
+ }
+ catch (Exception ex)
+ {
+ if(localDB != null)
+ {
+ localDB.Rollback();
+ }
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+
+ return false;
+ }
+ finally
+ {
+ if (localDB != null)
+ {
+ localDB.EndTrans();
+ }
+ }
+ }
public bool UpdateBoxNo(string tableName, string boxNo, string partNo)
{
@@ -306,7 +350,7 @@ namespace MESClassLibrary.BLL.BasicInfo
return false;
}
}
-
+
public DataTable SearchCountByBox(string boxNo, string tableName)
{
try
@@ -345,7 +389,19 @@ namespace MESClassLibrary.BLL.BasicInfo
return null;
}
}
-
+ public DataTable SearchBarCodeByWhere(string whereStr, string tableName, string row)
+ {
+ try
+ {
+ return db.SearchBarCodeByWhere(whereStr, tableName, row);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
public bool updateProductNature(string tableName, string barcode)
{
try
diff --git a/MESClassLibrary/BLL/BasicInfo/BasicBLL1.cs b/MESClassLibrary/BLL/BasicInfo/BasicBLL1.cs
new file mode 100644
index 0000000..321309a
--- /dev/null
+++ b/MESClassLibrary/BLL/BasicInfo/BasicBLL1.cs
@@ -0,0 +1,18 @@
+using MESClassLibrary.DAL.BasicInfo;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class BasicBLL1
+ {
+ private BasicDAL1 _basicDAL1 = new BasicDAL1();
+ public DataTable GetPackageSize()
+ {
+ return _basicDAL1.GetPackageSize();
+ }
+ }
+}
diff --git a/MESClassLibrary/BLL/Injection/UniqueBll.cs b/MESClassLibrary/BLL/Injection/UniqueBll.cs
index 2210947..6224844 100644
--- a/MESClassLibrary/BLL/Injection/UniqueBll.cs
+++ b/MESClassLibrary/BLL/Injection/UniqueBll.cs
@@ -14,6 +14,10 @@ namespace MESClassLibrary.BLL.Injection
{
return da.GetSjBarCodeSerialNo(stockNo,batch);
}
+ public string GetPackageCodeSerialNo(string partNo, string batch, string packageSize)
+ {
+ return da.GetPackageSerialNo(partNo, batch, packageSize);
+ }
///
/// 直供件 条码
///
diff --git a/MESClassLibrary/BLL/Inspection/InjectionBoxBLL.cs b/MESClassLibrary/BLL/Inspection/InjectionBoxBLL.cs
index 22927ba..934b12a 100644
--- a/MESClassLibrary/BLL/Inspection/InjectionBoxBLL.cs
+++ b/MESClassLibrary/BLL/Inspection/InjectionBoxBLL.cs
@@ -26,7 +26,30 @@ namespace MESClassLibrary.BLL.Inspection
return false;
}
}
-
+ public bool UpdateBoxCount(string packageCode, int addCount)
+ {
+ try
+ {
+ return db.UpdateInfo(packageCode, addCount);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+ public bool UpdatePrinted(string packageCode)
+ {
+ try
+ {
+ return db.UpdatePrinted(packageCode);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
public DataTable SeachInfoByBox(string partNo,string batchNo)
{
try
@@ -52,5 +75,17 @@ namespace MESClassLibrary.BLL.Inspection
return null;
}
}
+ public DataTable SearchUnBox(string stationID, string mould)
+ {
+ try
+ {
+ return db.SearchUnBox(stationID, mould);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
}
}
diff --git a/MESClassLibrary/BLL/PlasticBLL.cs b/MESClassLibrary/BLL/PlasticBLL.cs
index 0da7b55..15e01df 100644
--- a/MESClassLibrary/BLL/PlasticBLL.cs
+++ b/MESClassLibrary/BLL/PlasticBLL.cs
@@ -192,7 +192,7 @@ namespace MESClassLibrary.BLL
return null;
}
}
-
+
///
/// 根据ID查询信息
///
@@ -248,7 +248,19 @@ namespace MESClassLibrary.BLL
return null;
}
}
-
+ public DataTable SearchAllInfo(string stationID)
+ {
+ PlasticDAL da = new PlasticDAL();
+ try
+ {
+ return da.SearchAllInfo(stationID);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
public DataTable SearchPartByStation(string stationNo)
{
PlasticDAL da = new PlasticDAL();
diff --git a/MESClassLibrary/BLL/Wms/WmsBLL.cs b/MESClassLibrary/BLL/Wms/WmsBLL.cs
new file mode 100644
index 0000000..4b725fe
--- /dev/null
+++ b/MESClassLibrary/BLL/Wms/WmsBLL.cs
@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.DAL;
+using MESClassLibrary.DAL.BasicInfo;
+using MESClassLibrary.DAL.Injection;
+using MESClassLibrary.Enum;
+using MESClassLibrary.Model;
+
+namespace MESClassLibrary.BLL.Injection
+{
+ public class WmsBLL
+ {
+ private WmsDAL da=new WmsDAL();
+ private BarCodeDAl barCodeDal = new BarCodeDAl();
+
+ public string SaveInterface(string boxNo,string lastBoxNo1,string lastBoxNo2, WmsInterfaceEnum interfaceType)
+ {
+ //上一个是否传递成功,没成功重新传 左侧
+ if (!string.IsNullOrEmpty(lastBoxNo1))
+ {
+ bool exsit = da.IsSendPackageCode(lastBoxNo1);
+ if(exsit == false)
+ {
+ SendToInterface(lastBoxNo1);
+ }
+ }
+ //上一个是否传递成功,没成功重新传 右侧侧
+ if (!string.IsNullOrEmpty(lastBoxNo2))
+ {
+ bool exsit = da.IsSendPackageCode(lastBoxNo2);
+ if (exsit == false)
+ {
+ SendToInterface(lastBoxNo2);
+ }
+ }
+ string rst = SendToInterface(boxNo);
+ if (!string.IsNullOrEmpty(rst))
+ {
+ LogErrBLL.AddInfo(rst, MethodBase.GetCurrentMethod());
+ }
+ return rst;
+
+
+
+ }
+
+ private string SendToInterface(string boxNo)
+ {
+ DataTable barCodeTable = barCodeDal.SearchInfoByBox(boxNo);
+
+
+ string rst = da.SaveInterface(barCodeTable);
+ return rst;
+ }
+
+ public bool IsSendPackageCode(string pacakgCode)
+ {
+ return da.IsSendPackageCode(pacakgCode);
+ }
+
+ }
+}
diff --git a/MESClassLibrary/DAL/BasicInfo/BadInjectionDAL.cs b/MESClassLibrary/DAL/BasicInfo/BadInjectionDAL.cs
index 688a524..238120c 100644
--- a/MESClassLibrary/DAL/BasicInfo/BadInjectionDAL.cs
+++ b/MESClassLibrary/DAL/BasicInfo/BadInjectionDAL.cs
@@ -64,7 +64,26 @@ namespace MESClassLibrary.DAL.BasicInfo
return false;
}
}
+ public bool AddInfo(LocalDBService localDB, BadInjectionModel md)
+ {
+ try
+ {
+ #region 添加数据
+ string sql = "";
+ sql = $"INSERT INTO tb_Bad_Injection (ID,OneBarCode,[BarCode],[BadPosition],[BadReason],StationID)" +
+ $" VALUES ('{ md.ID}','{md.OneBarCode}','{md.BarCode}','{md.BadPosition}','{ md.BadReason}','{ md.StationID}')";
+ localDB.Exec_NonQuery(sql);
+
+ #endregion
+ return true;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
public DataTable SearchByCode(string code)
{
try
diff --git a/MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs b/MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs
index 25c328f..3237847 100644
--- a/MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs
+++ b/MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs
@@ -273,7 +273,7 @@ namespace MESClassLibrary.DAL.BasicInfo
#region 添加数据
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,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 (";
sql += "@ID,";
sql += "@StationID,";
@@ -293,10 +293,11 @@ namespace MESClassLibrary.DAL.BasicInfo
sql += "@Des3,";
sql += "@Des4,";
sql += "@Des5,";
+ sql += "@BoxNo,";
sql += "@Weight)";
#region 添加参数
- param = new SqlParameter[17];
+ param = new SqlParameter[18];
param[0] = new SqlParameter("@ID", SqlDbType.VarChar);
param[0].Value = md.ID;
@@ -345,8 +346,11 @@ namespace MESClassLibrary.DAL.BasicInfo
param[15] = new SqlParameter("@Des5", SqlDbType.VarChar);
param[15].Value = md.Des5;
- param[16] = new SqlParameter("@Weight", SqlDbType.Decimal);
- param[16].Value = md.Weight;
+ param[16] = new SqlParameter("@BoxNo", SqlDbType.VarChar);
+ param[16].Value = md.BoxNo;
+
+ param[17] = new SqlParameter("@Weight", SqlDbType.Decimal);
+ param[17].Value = md.Weight;
#endregion
@@ -370,61 +374,61 @@ namespace MESClassLibrary.DAL.BasicInfo
if (stationNo.Substring(2, 2) == "01" || stationNo.Substring(2, 2) == "02" ||
stationNo.Substring(2, 2) == "03" || stationNo.Substring(2, 2) == "04")
{
- sql = @"SELECT top 100 dbo.tb_BarCode1.BarCode, dbo.tb_Product.ProductName,
+ sql = @"SELECT top 100 dbo.tb_BarCode1.BarCode, dbo.tb_Product.ProductName, dbo.tb_BarCode1.BoxNo,
CASE dbo.tb_BarCode1.PrintType WHEN 0 THEN '自动打印' when 1 then '手动打印' when 2 then '补打' END AS PrintType,
dbo.tb_BarCode1.CreateTime
FROM dbo.tb_BarCode1 with (nolock) LEFT OUTER JOIN
dbo.tb_Product ON dbo.tb_BarCode1.StockNo = dbo.tb_Product.StockNo LEFT OUTER JOIN
dbo.tb_Station ON dbo.tb_BarCode1.StationID = dbo.tb_Station.StationID
- where dbo.tb_Station.StationNo=@stationNo and IsDel=0 " + " order by [CreateTime] desc";
+ where dbo.tb_Station.StationNo=@stationNo and IsDel=0 and IsBad=0 " + " order by [CreateTime] desc";
}
if (stationNo.Substring(2, 2) == "05" || stationNo.Substring(2, 2) == "06" ||
stationNo.Substring(2, 2) == "07" || stationNo.Substring(2, 2) == "08")
{
- sql = @"SELECT top 100 dbo.tb_BarCode2.BarCode, dbo.tb_Product.ProductName,
+ sql = @"SELECT top 100 dbo.tb_BarCode2.BarCode, dbo.tb_Product.ProductName, dbo.tb_BarCode2.BoxNo,
CASE dbo.tb_BarCode2.PrintType WHEN 0 THEN '自动打印' when 1 then '手动打印' when 2 then '补打' END AS PrintType,
dbo.tb_BarCode2.CreateTime
FROM dbo.tb_BarCode2 with (nolock) LEFT OUTER JOIN
dbo.tb_Product ON dbo.tb_BarCode2.StockNo = dbo.tb_Product.StockNo LEFT OUTER JOIN
dbo.tb_Station ON dbo.tb_BarCode2.StationID = dbo.tb_Station.StationID
- where dbo.tb_Station.StationNo=@stationNo and IsDel=0 " + " order by [CreateTime] desc";
+ where dbo.tb_Station.StationNo=@stationNo and IsDel=0 and IsBad=0 " + " order by [CreateTime] desc";
}
if (stationNo.Substring(2, 2) == "09" || stationNo.Substring(2, 2) == "10" ||
stationNo.Substring(2, 2) == "11" || stationNo.Substring(2, 2) == "12")
{
- sql = @"SELECT top 100 dbo.tb_BarCode3.BarCode, dbo.tb_Product.ProductName,
+ sql = @"SELECT top 100 dbo.tb_BarCode3.BarCode, dbo.tb_Product.ProductName, dbo.tb_BarCode3.BoxNo,
CASE dbo.tb_BarCode3.PrintType WHEN 0 THEN '自动打印' when 1 then '手动打印' when 2 then '补打' END AS PrintType,
dbo.tb_BarCode3.CreateTime
FROM dbo.tb_BarCode3 with (nolock) LEFT OUTER JOIN
dbo.tb_Product ON dbo.tb_BarCode3.StockNo = dbo.tb_Product.StockNo LEFT OUTER JOIN
dbo.tb_Station ON dbo.tb_BarCode3.StationID = dbo.tb_Station.StationID
- where dbo.tb_Station.StationNo=@stationNo and IsDel=0 " + " order by [CreateTime] desc";
+ where dbo.tb_Station.StationNo=@stationNo and IsDel=0 and IsBad=0 " + " order by [CreateTime] desc";
}
if (stationNo.Substring(2, 2) == "13" || stationNo.Substring(2, 2) == "14" ||
stationNo.Substring(2, 2) == "15" || stationNo.Substring(2, 2) == "16")
{
- sql = @"SELECT top 100 dbo.tb_BarCode4.BarCode, dbo.tb_Product.ProductName,
+ sql = @"SELECT top 100 dbo.tb_BarCode4.BarCode, dbo.tb_Product.ProductName, dbo.tb_BarCode4.BoxNo,
CASE dbo.tb_BarCode4.PrintType WHEN 0 THEN '自动打印' when 1 then '手动打印' when 2 then '补打' END AS PrintType,
dbo.tb_BarCode4.CreateTime
FROM dbo.tb_BarCode4 with (nolock) LEFT OUTER JOIN
dbo.tb_Product ON dbo.tb_BarCode4.StockNo = dbo.tb_Product.StockNo LEFT OUTER JOIN
dbo.tb_Station ON dbo.tb_BarCode4.StationID = dbo.tb_Station.StationID
- where dbo.tb_Station.StationNo=@stationNo and IsDel=0 " + " order by [CreateTime] desc";
+ where dbo.tb_Station.StationNo=@stationNo and IsDel=0 and IsBad=0 " + " order by [CreateTime] desc";
}
if (stationNo.Substring(2, 2) == "17" || stationNo.Substring(2, 2) == "18" ||
stationNo.Substring(2, 2) == "19" || stationNo.Substring(2, 2) == "20")
{
- sql = @"SELECT top 100 dbo.tb_BarCode5.BarCode, dbo.tb_Product.ProductName,
+ sql = @"SELECT top 100 dbo.tb_BarCode5.BarCode, dbo.tb_Product.ProductName, dbo.tb_BarCode5.BoxNo,
CASE dbo.tb_BarCode5.PrintType WHEN 0 THEN '自动打印' when 1 then '手动打印' when 2 then '补打' END AS PrintType,
dbo.tb_BarCode5.CreateTime
FROM dbo.tb_BarCode5 with (nolock) LEFT OUTER JOIN
dbo.tb_Product ON dbo.tb_BarCode5.StockNo = dbo.tb_Product.StockNo LEFT OUTER JOIN
dbo.tb_Station ON dbo.tb_BarCode5.StationID = dbo.tb_Station.StationID
- where dbo.tb_Station.StationNo=@stationNo and IsDel=0 " + " order by [CreateTime] desc";
+ where dbo.tb_Station.StationNo=@stationNo and IsDel=0 and IsBad=0 " + " order by [CreateTime] desc";
}
SqlParameter[] param = new SqlParameter[1];
@@ -445,12 +449,12 @@ namespace MESClassLibrary.DAL.BasicInfo
{
try
{
- string sql = @"SELECT dbo.tb_BarCode.BarCode, dbo.tb_Product.ProductName,
- CASE dbo.tb_BarCode.PrintType WHEN 0 THEN '自动打印' when 1 then '手动打印' when 2 then '补打' END AS PrintType,
- dbo.tb_BarCode.PrintTime
- FROM dbo.tb_BarCode LEFT OUTER JOIN
- dbo.tb_Product ON dbo.tb_BarCode.StockNo = dbo.tb_Product.StockNo LEFT OUTER JOIN
- dbo.tb_Station ON dbo.tb_BarCode.StationID = dbo.tb_Station.StationID
+ string sql = @"SELECT dbo.v_Code.BarCode, dbo.tb_Product.ProductName,
+ CASE dbo.v_Code.PrintType WHEN 0 THEN '自动打印' when 1 then '手动打印' when 2 then '补打' END AS PrintType,
+ dbo.v_Code.PrintTime
+ FROM dbo.v_Code LEFT OUTER JOIN
+ dbo.tb_Product ON dbo.v_Code.StockNo = dbo.tb_Product.StockNo LEFT OUTER JOIN
+ dbo.tb_Station ON dbo.v_Code.StationID = dbo.tb_Station.StationID
where dbo.tb_Station.StationNo=@stationNo and IsDel=0 " +
//" and substring([BarCode],len( [BarCode])-10,6)= right(DATENAME(yy, GETDATE()),2)+ RIGHT('00'+CAST(MONTH(GETDATE()) AS VARCHAR(2)),2)+RIGHT('00'+CAST(Day(GETDATE()) AS VARCHAR(2)),2)" +
" order by [CreateTime] desc";
@@ -469,7 +473,7 @@ namespace MESClassLibrary.DAL.BasicInfo
{
try
{
- string sql = @"SELECT top 200 dbo.v_Code.BarCode, dbo.tb_Product.ProductName,
+ string sql = @"SELECT top 200 dbo.v_Code.BarCode,dbo.v_Code.TableName,dbo.v_Code.BoxNo, dbo.tb_Product.ProductName,
CASE dbo.v_Code.PrintType WHEN 0 THEN '自动打印' WHEN 1 THEN '手动打印' WHEN 2 THEN '补打' END AS PrintType,
dbo.v_Code.CreateTime, dbo.v_Code.OneBarCode, dbo.v_Code.PlanID,
dbo.tb_InjectPlanReport.MaterialName, dbo.tb_InjectPlanReport.BatchNo
@@ -494,16 +498,16 @@ namespace MESClassLibrary.DAL.BasicInfo
{
try
{
- string sql = @"SELECT dbo.tb_BarCode.BarCode, dbo.tb_Product.ProductName,
- CASE dbo.tb_BarCode.PrintType WHEN 0 THEN '自动打印' WHEN 1 THEN '手动打印' WHEN 2 THEN '补打' END AS PrintType,
- dbo.tb_BarCode.PrintTime, dbo.tb_BarCode.OneBarCode,dbo.tb_BarCode.PlanID,
+ string sql = @"SELECT dbo.v_Code.BarCode, dbo.tb_Product.ProductName,dbo.v_Code.IsBad, dbo.v_Code.BoxNo,dbo.v_Code.PartNo, dbo.v_Code.StationID, dbo.v_Code.ID,
+ 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.TableName,
dbo.tb_InjectPlanReport.MaterialName, dbo.tb_InjectPlanReport.BatchNo
- FROM dbo.tb_BarCode LEFT OUTER JOIN
- dbo.tb_InjectPlanReport ON dbo.tb_BarCode.PlanID = dbo.tb_InjectPlanReport.InjectionPlanID LEFT OUTER JOIN
- dbo.tb_Product ON dbo.tb_BarCode.StockNo = dbo.tb_Product.StockNo LEFT OUTER JOIN
- dbo.tb_Station ON dbo.tb_BarCode.StationID = dbo.tb_Station.StationID
- WHERE dbo.tb_BarCode.IsDel = 0 and dbo.tb_BarCode.OneBarCode=@OneBarCode
- ORDER BY dbo.tb_BarCode.CreateTime DESC";
+ FROM dbo.v_Code LEFT OUTER JOIN
+ dbo.tb_InjectPlanReport ON dbo.v_Code.PlanID = dbo.tb_InjectPlanReport.InjectionPlanID LEFT OUTER JOIN
+ dbo.tb_Product ON dbo.v_Code.StockNo = dbo.tb_Product.StockNo LEFT OUTER JOIN
+ dbo.tb_Station ON dbo.v_Code.StationID = dbo.tb_Station.StationID
+ WHERE dbo.v_Code.IsDel = 0 and dbo.v_Code.OneBarCode=@OneBarCode
+ ORDER BY dbo.v_Code.CreateTime DESC";
SqlParameter[] param = new SqlParameter[1];
param[0] = new SqlParameter("@OneBarCode", SqlDbType.VarChar);
@@ -531,16 +535,16 @@ namespace MESClassLibrary.DAL.BasicInfo
// dbo.tb_Station ON dbo.tb_BarCode.StationID = dbo.tb_Station.StationID
// WHERE dbo.tb_BarCode.IsDel = 0 and dbo.tb_BarCode.BarCode=@BarCode
// ORDER BY dbo.tb_BarCode.CreateTime DESC";
- string sql = @"SELECT dbo.tb_BarCode.BarCode, dbo.tb_Product.ProductName,
- CASE dbo.tb_BarCode.PrintType WHEN 0 THEN '自动打印' WHEN 1 THEN '手动打印' WHEN 2 THEN '补打' END AS PrintType,
- dbo.tb_BarCode.PrintTime, dbo.tb_BarCode.OneBarCode,dbo.tb_BarCode.PlanID,
+ string sql = @"SELECT dbo.v_Code.BarCode, dbo.tb_Product.ProductName,
+ 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.tb_InjectPlanReport.MaterialName, dbo.tb_InjectPlanReport.BatchNo
- FROM dbo.tb_BarCode LEFT OUTER JOIN
- dbo.tb_InjectPlanReport ON dbo.tb_BarCode.PlanID = dbo.tb_InjectPlanReport.InjectionPlanID LEFT OUTER JOIN
- dbo.tb_Product ON dbo.tb_BarCode.StockNo = dbo.tb_Product.StockNo LEFT OUTER JOIN
- dbo.tb_Station ON dbo.tb_BarCode.StationID = dbo.tb_Station.StationID
- WHERE dbo.tb_BarCode.IsDel = 0 and dbo.tb_BarCode.BarCode=@BarCode
- ORDER BY dbo.tb_BarCode.CreateTime DESC";
+ FROM dbo.v_Code LEFT OUTER JOIN
+ dbo.tb_InjectPlanReport ON dbo.v_Code.PlanID = dbo.tb_InjectPlanReport.InjectionPlanID LEFT OUTER JOIN
+ dbo.tb_Product ON dbo.v_Code.StockNo = dbo.tb_Product.StockNo LEFT OUTER JOIN
+ dbo.tb_Station ON dbo.v_Code.StationID = dbo.tb_Station.StationID
+ WHERE dbo.v_Code.IsDel = 0 and dbo.v_Code.BarCode=@BarCode
+ ORDER BY dbo.v_Code.CreateTime DESC";
SqlParameter[] param = new SqlParameter[1];
param[0] = new SqlParameter("@BarCode", SqlDbType.VarChar);
@@ -891,7 +895,48 @@ namespace MESClassLibrary.DAL.BasicInfo
return false;
}
}
+ public bool UpdateBoxNoByID(LocalDBService localDB, string tableName, string boxNo, string id)
+ {
+ try
+ {
+ #region 添加数据
+ string sql = "";
+ sql = $@"update {tableName} set BoxNo='{boxNo}' where id='{id}'";
+
+ localDB.Exec_NonQuery(sql);
+ //SqlHelper.ExecuteNonQuery(SqlHelper.GetConnSting(), CommandType.Text, sql, param);
+ #endregion
+ return true;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public bool UpdateBoxNoNull(LocalDBService localDB, string tableName, string id)
+ {
+ try
+ {
+ #region 添加数据
+ string sql = "";
+ sql = $@"update {tableName} set IsBad=1,BoxNo='' where id='{id}'";
+ #region 添加参数
+
+ #endregion
+ localDB.Exec_NonQuery(sql);
+ //SqlHelper.ExecuteNonQuery(SqlHelper.GetConnSting(), CommandType.Text, sql, param);
+ #endregion
+ return true;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
public bool UpdateIsBad(string tableName, string onebarcode, string barcode)
{
try
@@ -905,7 +950,8 @@ namespace MESClassLibrary.DAL.BasicInfo
if (onebarcode != "")
{
- sql = @"update " + tableName + " set IsBad=1 where OneBarCode=@OneBarCode and BoxNo is null";
+ //sql = @"update " + tableName + " set IsBad=1 where OneBarCode=@OneBarCode and BoxNo is null";
+ sql = @"update " + tableName + " set IsBad=1 where OneBarCode=@OneBarCode";
#region 添加参数
@@ -917,7 +963,8 @@ namespace MESClassLibrary.DAL.BasicInfo
if (barcode != "")
{
- sql = @"update " + tableName + " set IsBad=1 where BarCode=@BarCode and BoxNo is null";
+ //sql = @"update " + tableName + " set IsBad=1 where BarCode=@BarCode and BoxNo is null";
+ sql = @"update " + tableName + " set IsBad=1 where BarCode=@BarCode ";
#region 添加参数
@@ -961,7 +1008,25 @@ namespace MESClassLibrary.DAL.BasicInfo
{
try
{
- string sql = @"select * from " + tableName + " where BoxNo=@BoxNo and PrintType in (0,1) and IsDel=0 ";
+ string sql = @"select * from " + tableName + " where BoxNo=@BoxNo and PrintType in (0,1) and IsDel=0 and IsBad=0";
+
+ SqlParameter[] param = new SqlParameter[1];
+ param[0] = new SqlParameter("@BoxNo", SqlDbType.VarChar);
+ param[0].Value = boxNo;
+
+ return SqlHelper.ExecuteDataset(SqlHelper.GetConnSting(), CommandType.Text, sql, param).Tables[0];
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+ public DataTable SearchInfoByBox(string boxNo)
+ {
+ try
+ {
+ string sql = @"select * from v_Code where BoxNo=@BoxNo and IsDel=0 and IsBad=0";
SqlParameter[] param = new SqlParameter[1];
param[0] = new SqlParameter("@BoxNo", SqlDbType.VarChar);
@@ -987,7 +1052,7 @@ namespace MESClassLibrary.DAL.BasicInfo
{
try
{
- string sql = @"select top " + row + " * from " + tableName + " where BoxNo=@BoxNo IsDel=0 order by CreateTime desc";
+ string sql = @"select top " + row + " * from " + tableName + " where BoxNo=@BoxNo and IsDel=0 and IsBad=0 order by CreateTime desc";
SqlParameter[] param = new SqlParameter[1];
param[0] = new SqlParameter("@BoxNo", SqlDbType.VarChar);
@@ -1001,7 +1066,24 @@ namespace MESClassLibrary.DAL.BasicInfo
return null;
}
}
+ public DataTable SearchBarCodeByWhere(string whereStr, string tableName, string row)
+ {
+ try
+ {
+ string sql = @"select top " + row + " * from " + tableName + $" where {whereStr} and IsDel=0 and IsBad=0 order by CreateTime desc";
+
+ SqlParameter[] param = new SqlParameter[0];
+ // param[0] = new SqlParameter("@BoxNo", SqlDbType.VarChar);
+ // param[0].Value = whereStr;
+ return SqlHelper.ExecuteDataset(SqlHelper.GetConnSting(), CommandType.Text, sql, param).Tables[0];
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
///
/// 将产品转为市场件
///
diff --git a/MESClassLibrary/DAL/BasicInfo/BasicDAL1.cs b/MESClassLibrary/DAL/BasicInfo/BasicDAL1.cs
new file mode 100644
index 0000000..06065cb
--- /dev/null
+++ b/MESClassLibrary/DAL/BasicInfo/BasicDAL1.cs
@@ -0,0 +1,28 @@
+using MESClassLibrary.BLL.Log;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+
+namespace MESClassLibrary.DAL.BasicInfo
+{
+ public class BasicDAL1
+ {
+ public DataTable GetPackageSize()
+ {
+ try
+ {
+ string sql = @"SELECT * from tb_A_PackageSize ";
+
+ return SqlHelper.ExecuteDataset(SqlHelper.GetConnSting(), CommandType.Text, sql, null).Tables[0];
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+ }
+}
diff --git a/MESClassLibrary/DAL/BasicInfo/PlasticDAL.cs b/MESClassLibrary/DAL/BasicInfo/PlasticDAL.cs
index 3f398c5..9ed62e2 100644
--- a/MESClassLibrary/DAL/BasicInfo/PlasticDAL.cs
+++ b/MESClassLibrary/DAL/BasicInfo/PlasticDAL.cs
@@ -35,7 +35,27 @@ namespace MESClassLibrary.DAL.BasicInfo
}
}
+ public DataTable SearchAllInfo(string stationID)
+ {
+ try
+ {
+ string sql = @"select * from [tb_Plastic] where StationID=@StationID";
+
+ SqlParameter[] param = new SqlParameter[1];
+
+ param[0] = new SqlParameter("@StationID", SqlDbType.VarChar);
+ param[0].Value = stationID;
+
+ return SqlHelper.ExecuteDataset(SqlHelper.GetConnSting(), CommandType.Text, sql, param).Tables[0];
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+
+ }
+ }
public DataTable SearchPartByStation(string stationNo)
{
try
diff --git a/MESClassLibrary/DAL/Injection/InjectionBoxDAL.cs b/MESClassLibrary/DAL/Injection/InjectionBoxDAL.cs
index 35cabb5..56f176a 100644
--- a/MESClassLibrary/DAL/Injection/InjectionBoxDAL.cs
+++ b/MESClassLibrary/DAL/Injection/InjectionBoxDAL.cs
@@ -21,16 +21,20 @@ namespace MESClassLibrary.DAL.Injection
#region 添加数据
string sql = "";
SqlParameter[] param = null;
- sql = "INSERT INTO " + TableName + " (ID,BoxNo,BoxCount,IsFlag,BoxType";
+ sql = "INSERT INTO " + TableName + " (ID,BoxNo,BoxCount,IsFlag,StationNo, PartName,Mould,StandardQty,BoxType";
sql += ") VALUES (";
sql += "@ID,";
sql += "@BoxNo,";
sql += "@BoxCount,";
sql += "@IsFlag,";
+ sql += "@StationNo,";
+ sql += "@PartName,";
+ sql += "@Mould,";
+ sql += "@StandardQty,";
sql += "@BoxType)";
#region 添加参数
- param = new SqlParameter[5];
+ param = new SqlParameter[9];
param[0] = new SqlParameter("@ID", SqlDbType.VarChar);
param[0].Value = md.ID;
@@ -43,8 +47,20 @@ namespace MESClassLibrary.DAL.Injection
param[3] = new SqlParameter("@IsFlag", SqlDbType.Int);
param[3].Value = md.IsFlag;
- param[4] = new SqlParameter("@BoxType", SqlDbType.Int);
- param[4].Value = md.BoxType;
+ param[4] = new SqlParameter("@StationNo", SqlDbType.VarChar);
+ param[4].Value = md.StationNo;
+
+ param[5] = new SqlParameter("@PartName", SqlDbType.NVarChar);
+ param[5].Value = md.PartName;
+
+ param[6] = new SqlParameter("@Mould", SqlDbType.NVarChar);
+ param[6].Value = md.Mould;
+
+ param[7] = new SqlParameter("@StandardQty", SqlDbType.NVarChar);
+ param[7].Value = md.StandardQty;
+
+ param[8] = new SqlParameter("@BoxType", SqlDbType.VarChar);
+ param[8].Value = md.BoxType;
#endregion
@@ -58,7 +74,71 @@ namespace MESClassLibrary.DAL.Injection
return false;
}
}
+ public bool UpdateInfo(string packageCode, int addCount)
+ {
+ try
+ {
+ int i = 0;
+ if(addCount > 0)
+ {
+ i = 0;
+ }
+ else
+ {
+ i = 1;
+ }
+ #region 添加数据
+ string sql = "";
+ SqlParameter[] param = null;
+ sql = "update " + TableName + $" set BoxCount = BoxCount+ {addCount} ";
+ sql += $" where BoxCount >={i} and ";
+ sql += "BoxNo=@BoxNo";
+
+ #region 添加参数
+ param = new SqlParameter[1];
+ param[0] = new SqlParameter("BoxNo", SqlDbType.VarChar);
+ param[0].Value = packageCode;
+ #endregion
+
+ SqlHelper.ExecuteNonQuery(SqlHelper.GetConnSting(), CommandType.Text, sql, param);
+ #endregion
+ return true;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+ public bool UpdatePrinted(string packageCode)
+ {
+ try
+ {
+ #region 添加数据
+ string sql = "";
+ SqlParameter[] param = null;
+ sql = "update " + TableName + " set IsPrint = 1, PrintTime=getdate() ";
+ sql += " where ";
+ sql += "BoxNo=@BoxNo";
+
+ #region 添加参数
+ param = new SqlParameter[1];
+ param[0] = new SqlParameter("BoxNo", SqlDbType.VarChar);
+ param[0].Value = packageCode;
+
+ #endregion
+
+ SqlHelper.ExecuteNonQuery(SqlHelper.GetConnSting(), CommandType.Text, sql, param);
+ #endregion
+ return true;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
public DataTable SeachInfoByBox(string partNo,string batchNo)
{
try
@@ -100,5 +180,25 @@ namespace MESClassLibrary.DAL.Injection
return null;
}
}
+ public DataTable SearchUnBox(string stationID,string mould)
+ {
+ try
+ {
+ string sql = @"select * from " + TableName + " where StationNo=@StationNo and Mould=@Mould and IsPrint=0 order by CreateTime desc ";
+
+ SqlParameter[] param = new SqlParameter[2];
+ param[0] = new SqlParameter("@StationNo", SqlDbType.VarChar);
+ param[0].Value = stationID;
+ param[1] = new SqlParameter("@Mould", SqlDbType.VarChar);
+ param[1].Value = mould;
+
+ return SqlHelper.ExecuteDataset(SqlHelper.GetConnSting(), CommandType.Text, sql, param).Tables[0];
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
}
}
diff --git a/MESClassLibrary/DAL/Injection/UniqueDal.cs b/MESClassLibrary/DAL/Injection/UniqueDal.cs
index ddde9dc..0229025 100644
--- a/MESClassLibrary/DAL/Injection/UniqueDal.cs
+++ b/MESClassLibrary/DAL/Injection/UniqueDal.cs
@@ -46,5 +46,28 @@ namespace MESClassLibrary.DAL.Injection
return GetSjBarCodeSerialNo(stockNo, batch);
}
}
+
+ public string GetPackageSerialNo(string partNo, string batch,string packageSize)
+ {
+ //if (stockNo.Length != 10)
+ //{
+ // throw new Exception($"生成塑件条码错误,因为存货代码[{stockNo}]格式不正确,必须10位长度.");
+ //}
+ if (packageSize.Length < 3)
+ {
+ packageSize = packageSize.PadLeft(3, '0');
+ }
+ string s = GetBillNo(partNo + batch, 4);
+ string sjBarCode = partNo + "." + batch + "." + packageSize + "." + s;
+ try
+ {
+ SqlHelper.ExecuteNonQuery(SqlHelper.GetConnSting(), CommandType.Text, $" insert into tb_BarCodeUnique(OneBarCode) values('{sjBarCode}')");
+ return sjBarCode;
+ }
+ catch (Exception ex)
+ {
+ return GetPackageSerialNo(partNo, batch, packageSize);
+ }
+ }
}
}
diff --git a/MESClassLibrary/DAL/LocalDBService.cs b/MESClassLibrary/DAL/LocalDBService.cs
new file mode 100644
index 0000000..a534163
--- /dev/null
+++ b/MESClassLibrary/DAL/LocalDBService.cs
@@ -0,0 +1,110 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+
+namespace MESClassLibrary.DAL
+{
+ public class LocalDBService
+ {
+ // Token: 0x06000058 RID: 88 RVA: 0x00004839 File Offset: 0x00003839
+ public LocalDBService(string conn)
+ {
+ SqlHelper.sqlCommandTimeOut = 3000;
+ m_conn = conn;
+ }
+
+ // Token: 0x06000059 RID: 89 RVA: 0x00004863 File Offset: 0x00003863
+ public void BeginTrans()
+ {
+ this.m_connection = new SqlConnection(LocalDBService.m_conn);
+ this.m_connection.Open();
+ this.m_trans = this.m_connection.BeginTransaction();
+ this.IsInTrans = true;
+ }
+
+ // Token: 0x0600005A RID: 90 RVA: 0x0000489C File Offset: 0x0000389C
+ public void Commit()
+ {
+ if (this.IsInTrans)
+ {
+ this.m_trans.Commit();
+ }
+ }
+
+ // Token: 0x0600005B RID: 91 RVA: 0x000048C8 File Offset: 0x000038C8
+ public void Rollback()
+ {
+ if (this.IsInTrans)
+ {
+ this.m_trans.Rollback();
+ }
+ }
+
+ // Token: 0x0600005C RID: 92 RVA: 0x000048F1 File Offset: 0x000038F1
+ public void EndTrans()
+ {
+ this.m_connection.Close();
+ this.IsInTrans = false;
+ }
+
+ // Token: 0x0600005D RID: 93 RVA: 0x00004908 File Offset: 0x00003908
+ public DataSet Exec_DataSet(string sql)
+ {
+ DataSet result;
+ if (this.IsInTrans)
+ {
+ result = SqlHelper.ExecuteDataset(this.m_trans, CommandType.Text, sql);
+ }
+ else
+ {
+ result = SqlHelper.ExecuteDataset(LocalDBService.m_conn, CommandType.Text, sql);
+ }
+ return result;
+ }
+
+ // Token: 0x0600005E RID: 94 RVA: 0x00004948 File Offset: 0x00003948
+ public object Exec_Object(string sql)
+ {
+ object result;
+ if (this.IsInTrans)
+ {
+ result = SqlHelper.ExecuteScalar(this.m_trans, CommandType.Text, sql);
+ }
+ else
+ {
+ result = SqlHelper.ExecuteScalar(LocalDBService.m_conn, CommandType.Text, sql);
+ }
+ return result;
+ }
+
+ // Token: 0x0600005F RID: 95 RVA: 0x00004988 File Offset: 0x00003988
+ public bool Exec_NonQuery(string sql)
+ {
+ int num;
+ if (this.IsInTrans)
+ {
+ num = SqlHelper.ExecuteNonQuery(this.m_trans, CommandType.Text, sql);
+ }
+ else
+ {
+ num = SqlHelper.ExecuteNonQuery(LocalDBService.m_conn, CommandType.Text, sql);
+ }
+ return num > 0;
+ }
+
+ // Token: 0x04000006 RID: 6
+ public static string m_conn = string.Empty;
+
+ // Token: 0x04000007 RID: 7
+ private SqlTransaction m_trans = null;
+
+ // Token: 0x04000008 RID: 8
+ private SqlConnection m_connection = null;
+
+ // Token: 0x04000009 RID: 9
+ private bool IsInTrans = false;
+ }
+}
diff --git a/MESClassLibrary/DAL/SqlHelper.cs b/MESClassLibrary/DAL/SqlHelper.cs
index e79e95f..b06c5a3 100644
--- a/MESClassLibrary/DAL/SqlHelper.cs
+++ b/MESClassLibrary/DAL/SqlHelper.cs
@@ -16,6 +16,20 @@ namespace MESClassLibrary.DAL
///
public sealed class SqlHelper
{
+ public static int sqlCommandTimeOut = 30;
+
+
+
+
+
+
+
+
+
+
+
+
+
#region 私有构造函数和方法
private SqlHelper() { }
@@ -183,6 +197,10 @@ namespace MESClassLibrary.DAL
{
return ConfigurationManager.ConnectionStrings["SqlConnString"].ConnectionString;
}
+ public static string GetWmsConnSting()
+ {
+ return ConfigurationManager.ConnectionStrings["WmsConnString"].ConnectionString;
+ }
///
/// 一个有效的数据库连接对象
///
@@ -2576,4 +2594,6 @@ namespace MESClassLibrary.DAL
#endregion 参数集检索结束
}
+
+
}
diff --git a/MESClassLibrary/DAL/Wms/WmsDAL.cs b/MESClassLibrary/DAL/Wms/WmsDAL.cs
new file mode 100644
index 0000000..0f83f97
--- /dev/null
+++ b/MESClassLibrary/DAL/Wms/WmsDAL.cs
@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using MESClassLibrary.BLL;
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Enum;
+using MESClassLibrary.Model;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace MESClassLibrary.DAL.Injection
+{
+ public class WmsDAL
+ {
+ public string SaveInterface(DataTable barCodeTable)
+ {
+ LocalDBService local = new LocalDBService(SqlHelper.GetConnSting());
+ try
+ {
+ local.BeginTrans();
+ foreach (DataRow dr in barCodeTable.Rows)
+ {
+ string sql = $" insert into tb_Injectionn_Interface(PackageCode,OneBarCode,BarCode,Remark)" +
+ $" values ('{dr["BoxNo"]}','{dr["OneBarCode"]}','{dr["BarCode"]}','')";
+ local.Exec_NonQuery(sql);
+ }
+ local.Commit();
+ }
+ catch (Exception ex)
+ {
+ if (local != null)
+ {
+ local.Rollback();
+ }
+ return ex.Message;
+ }
+ finally
+ {
+ if (local != null)
+ {
+ local.EndTrans();
+ }
+ }
+ return null;
+ }
+
+ public bool DeleteRecord(LocalDBService localDB,string boxNo,string oneBarCode,string barCode )
+ {
+ try
+ {
+ string sql = $"delete from tb_Injectionn_Interface where PackageCode='{boxNo}' and OneBarCode='{oneBarCode}' and BarCode='{barCode}'";
+ localDB.Exec_NonQuery(sql);
+ return true;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+ public bool AddRecord(LocalDBService localDB, string boxNo, string oneBarCode, string barCode)
+ {
+ try
+ {
+ string sql = $"insert into tb_Injectionn_Interface(PackageCode,OneBarCode,BarCode,Remark) values ('{boxNo}','{oneBarCode}','{barCode}','')";
+ localDB.Exec_NonQuery(sql);
+ return true;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+ ///
+ /// 箱码是否已传递到wms
+ ///
+ ///
+ ///
+ public bool IsSendPackageCode(string pacakgCode)
+ {
+ try
+ {
+ string sql = $" select * from tb_Injectionn_Interface where PackageCode='{pacakgCode}'";
+ DataTable dt = SqlHelper.ExecuteDataset(SqlHelper.GetConnSting(), CommandType.Text, sql, null).Tables[0];
+
+ return dt.Rows.Count>0;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return true;
+ }
+ }
+
+
+ }
+}
diff --git a/MESClassLibrary/Enum/WmsInterfaceEnum.cs b/MESClassLibrary/Enum/WmsInterfaceEnum.cs
new file mode 100644
index 0000000..1a2dbc4
--- /dev/null
+++ b/MESClassLibrary/Enum/WmsInterfaceEnum.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace MESClassLibrary.Enum
+{
+ public enum WmsInterfaceEnum
+ {
+ 塑件箱码报工
+ }
+}
diff --git a/MESClassLibrary/MESClassLibrary.csproj b/MESClassLibrary/MESClassLibrary.csproj
index 54457ba..c0fb74c 100644
--- a/MESClassLibrary/MESClassLibrary.csproj
+++ b/MESClassLibrary/MESClassLibrary.csproj
@@ -63,6 +63,7 @@
+
@@ -150,6 +151,7 @@
+
@@ -166,6 +168,7 @@
+
@@ -196,6 +199,7 @@
+
@@ -220,6 +224,7 @@
+
@@ -721,6 +726,7 @@
BBMPT.tt
+
@@ -797,6 +803,7 @@
+
diff --git a/MESClassLibrary/Model/InjectionBoxModel.cs b/MESClassLibrary/Model/InjectionBoxModel.cs
index e01ce86..0c34080 100644
--- a/MESClassLibrary/Model/InjectionBoxModel.cs
+++ b/MESClassLibrary/Model/InjectionBoxModel.cs
@@ -16,5 +16,13 @@ namespace MESClassLibrary.Model
public int IsFlag { get; set; }
public int BoxType { get; set; }
+ public string StationNo { get; set; }
+
+
+ public string PartName { get; set; }
+ public string Mould { get; set; }
+ public string StandardQty { get; set; }
+ public string IsPrint { get; set; }
+ public DateTime PrintTime { get; set; }
}
}
diff --git a/MESClassLibrary/Model/WmsModel.cs b/MESClassLibrary/Model/WmsModel.cs
new file mode 100644
index 0000000..72d7339
--- /dev/null
+++ b/MESClassLibrary/Model/WmsModel.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace MESClassLibrary.Model
+{
+ public class WmsModel
+ {
+
+ }
+}
diff --git a/PaintingPC/Program.cs b/PaintingPC/Program.cs
index 14ea196..eff04a9 100644
--- a/PaintingPC/Program.cs
+++ b/PaintingPC/Program.cs
@@ -1,6 +1,8 @@
using System;
using System.Collections.Generic;
+using System.Diagnostics;
using System.Linq;
+using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -19,8 +21,72 @@ namespace PaintingPC
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
+
+ Application.SetUnhandledExceptionMode(UnhandledExceptionMode.CatchException);
+
+ //处理UI线程异常
+
+ Application.ThreadException += new System.Threading.ThreadExceptionEventHandler(Application_ThreadException);
+
+ //处理非UI线程异常
+
+ AppDomain.CurrentDomain.UnhandledException += new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
+
Application.Run(new FrmChainDown());
}
+ #region 系统异常处理
+ static void Application_ThreadException(object sender, System.Threading.ThreadExceptionEventArgs e)
+ {
+ string str = GetExceptionMsg(e.Exception, e.ToString());
+ MessageBox.Show(str);
+ //LogManager.WriteLog(str);
+ }
+
+
+
+ static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
+ {
+ string str = GetExceptionMsg(e.ExceptionObject as Exception, e.ToString());
+ MessageBox.Show(str);
+ //LogManager.WriteLog(str);
+ }
+ static string GetExceptionMsg(Exception ex, string backStr)
+ {
+ StringBuilder sb = new StringBuilder();
+
+ sb.AppendLine("****************************异常文本****************************");
+ sb.AppendLine("【出现时间】：" + DateTime.Now.ToString());
+
+ if (ex != null)
+ {
+
+ sb.AppendLine("【异常类型】：" + ex.GetType().Name);
+
+ sb.AppendLine("【异常信息】：" + ex.Message);
+
+ sb.AppendLine("【堆栈调用】：" + ex.StackTrace);
+
+ }
+
+ else
+
+ {
+
+ sb.AppendLine("【未处理异常】：" + backStr);
+
+ }
+
+ sb.AppendLine("***************************************************************");
+
+ return sb.ToString();
+ }
+ private static void ExceptionMonitor_ExceptionOver()
+ {
+ MessageBox.Show("系统遇到未知异常，即将重新启动。");
+ Process.Start(Application.ExecutablePath);
+ Process.GetCurrentProcess().Kill();
+ }
+ #endregion
}
}
diff --git a/喷涂上线/Code/PaintingPC/FrmChainUp1.Designer.cs b/喷涂上线/Code/PaintingPC/FrmChainUp1.Designer.cs
index 0840eaa..6bebd9d 100644
--- a/喷涂上线/Code/PaintingPC/FrmChainUp1.Designer.cs
+++ b/喷涂上线/Code/PaintingPC/FrmChainUp1.Designer.cs
@@ -81,7 +81,7 @@
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 6.25F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 35.64453F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
- this.tableLayoutPanel1.Size = new System.Drawing.Size(2560, 1840);
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(2560, 1830);
this.tableLayoutPanel1.TabIndex = 0;
//
// tableLayoutPanel2
@@ -100,8 +100,8 @@
this.tableLayoutPanel2.Name = "tableLayoutPanel2";
this.tableLayoutPanel2.RowCount = 1;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
- this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 144F));
- this.tableLayoutPanel2.Size = new System.Drawing.Size(2560, 147);
+ this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 146F));
+ this.tableLayoutPanel2.Size = new System.Drawing.Size(2560, 146);
this.tableLayoutPanel2.TabIndex = 0;
//
// panel1
@@ -111,7 +111,7 @@
this.panel1.Location = new System.Drawing.Point(1, 1);
this.panel1.Margin = new System.Windows.Forms.Padding(0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(255, 145);
+ this.panel1.Size = new System.Drawing.Size(255, 144);
this.panel1.TabIndex = 0;
//
// pictureBox1
@@ -119,9 +119,9 @@
this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
this.pictureBox1.Location = new System.Drawing.Point(0, 0);
- this.pictureBox1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+ this.pictureBox1.Margin = new System.Windows.Forms.Padding(6);
this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(255, 145);
+ this.pictureBox1.Size = new System.Drawing.Size(255, 144);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox1.TabIndex = 0;
this.pictureBox1.TabStop = false;
@@ -134,7 +134,7 @@
this.panel2.Location = new System.Drawing.Point(257, 1);
this.panel2.Margin = new System.Windows.Forms.Padding(0);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(2044, 145);
+ this.panel2.Size = new System.Drawing.Size(2044, 144);
this.panel2.TabIndex = 1;
//
// label1
@@ -146,7 +146,7 @@
this.label1.Location = new System.Drawing.Point(0, 0);
this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(2044, 145);
+ this.label1.Size = new System.Drawing.Size(2044, 144);
this.label1.TabIndex = 0;
this.label1.Text = "悬挂链上件看板";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -158,7 +158,7 @@
this.panel3.Location = new System.Drawing.Point(2302, 1);
this.panel3.Margin = new System.Windows.Forms.Padding(0);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(257, 145);
+ this.panel3.Size = new System.Drawing.Size(257, 144);
this.panel3.TabIndex = 2;
//
// button1
@@ -171,7 +171,7 @@
this.button1.Location = new System.Drawing.Point(0, 0);
this.button1.Margin = new System.Windows.Forms.Padding(0);
this.button1.Name = "button1";
- this.button1.Size = new System.Drawing.Size(257, 145);
+ this.button1.Size = new System.Drawing.Size(257, 144);
this.button1.TabIndex = 0;
this.button1.Text = "退出";
this.button1.UseVisualStyleBackColor = false;
@@ -182,10 +182,10 @@
this.panel4.BackColor = System.Drawing.SystemColors.Control;
this.panel4.Controls.Add(this.comboBox1);
this.panel4.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel4.Location = new System.Drawing.Point(0, 147);
+ this.panel4.Location = new System.Drawing.Point(0, 146);
this.panel4.Margin = new System.Windows.Forms.Padding(0);
this.panel4.Name = "panel4";
- this.panel4.Size = new System.Drawing.Size(2560, 115);
+ this.panel4.Size = new System.Drawing.Size(2560, 114);
this.panel4.TabIndex = 1;
//
// comboBox1
@@ -218,7 +218,7 @@
"A09",
"A10"});
this.comboBox1.Location = new System.Drawing.Point(0, 0);
- this.comboBox1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+ this.comboBox1.Margin = new System.Windows.Forms.Padding(6);
this.comboBox1.MaxDropDownItems = 20;
this.comboBox1.Name = "comboBox1";
this.comboBox1.Size = new System.Drawing.Size(2560, 112);
@@ -229,10 +229,10 @@
this.panel5.BackColor = System.Drawing.Color.Black;
this.panel5.Controls.Add(this.tableLayoutPanel3);
this.panel5.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel5.Location = new System.Drawing.Point(0, 262);
+ this.panel5.Location = new System.Drawing.Point(0, 260);
this.panel5.Margin = new System.Windows.Forms.Padding(0);
this.panel5.Name = "panel5";
- this.panel5.Size = new System.Drawing.Size(2560, 656);
+ this.panel5.Size = new System.Drawing.Size(2560, 652);
this.panel5.TabIndex = 2;
//
// tableLayoutPanel3
@@ -252,7 +252,7 @@
this.tableLayoutPanel3.RowCount = 2;
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 80F));
- this.tableLayoutPanel3.Size = new System.Drawing.Size(2560, 656);
+ this.tableLayoutPanel3.Size = new System.Drawing.Size(2560, 652);
this.tableLayoutPanel3.TabIndex = 0;
//
// panel6
@@ -263,14 +263,14 @@
this.panel6.Location = new System.Drawing.Point(1, 1);
this.panel6.Margin = new System.Windows.Forms.Padding(0);
this.panel6.Name = "panel6";
- this.panel6.Size = new System.Drawing.Size(1278, 130);
+ this.panel6.Size = new System.Drawing.Size(1278, 129);
this.panel6.TabIndex = 0;
//
// textBox1
//
this.textBox1.Font = new System.Drawing.Font("微软雅黑", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.textBox1.Location = new System.Drawing.Point(278, 22);
- this.textBox1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+ this.textBox1.Margin = new System.Windows.Forms.Padding(6);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(964, 92);
this.textBox1.TabIndex = 1;
@@ -292,10 +292,10 @@
this.label4.Dock = System.Windows.Forms.DockStyle.Fill;
this.label4.Font = new System.Drawing.Font("微软雅黑", 150F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ForeColor = System.Drawing.Color.Yellow;
- this.label4.Location = new System.Drawing.Point(1, 132);
+ this.label4.Location = new System.Drawing.Point(1, 131);
this.label4.Margin = new System.Windows.Forms.Padding(0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(1278, 523);
+ this.label4.Size = new System.Drawing.Size(1278, 520);
this.label4.TabIndex = 1;
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
@@ -304,10 +304,10 @@
this.label5.Dock = System.Windows.Forms.DockStyle.Fill;
this.label5.Font = new System.Drawing.Font("微软雅黑", 150F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ForeColor = System.Drawing.Color.White;
- this.label5.Location = new System.Drawing.Point(1280, 132);
+ this.label5.Location = new System.Drawing.Point(1280, 131);
this.label5.Margin = new System.Windows.Forms.Padding(0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(1279, 523);
+ this.label5.Size = new System.Drawing.Size(1279, 520);
this.label5.TabIndex = 2;
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
@@ -319,7 +319,7 @@
this.label6.Location = new System.Drawing.Point(1286, 1);
this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(1267, 130);
+ this.label6.Size = new System.Drawing.Size(1267, 129);
this.label6.TabIndex = 3;
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
@@ -331,10 +331,10 @@
this.panel7.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel7.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel7.ForeColor = System.Drawing.Color.White;
- this.panel7.Location = new System.Drawing.Point(0, 918);
+ this.panel7.Location = new System.Drawing.Point(0, 912);
this.panel7.Margin = new System.Windows.Forms.Padding(0);
this.panel7.Name = "panel7";
- this.panel7.Size = new System.Drawing.Size(2560, 922);
+ this.panel7.Size = new System.Drawing.Size(2560, 918);
this.panel7.TabIndex = 3;
//
// btOK
@@ -342,7 +342,7 @@
this.btOK.BackColor = System.Drawing.Color.LimeGreen;
this.btOK.Font = new System.Drawing.Font("宋体", 26.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btOK.Location = new System.Drawing.Point(2388, 532);
- this.btOK.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+ this.btOK.Margin = new System.Windows.Forms.Padding(6);
this.btOK.Name = "btOK";
this.btOK.Size = new System.Drawing.Size(164, 368);
this.btOK.TabIndex = 0;
@@ -359,10 +359,10 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(2560, 1840);
+ this.ClientSize = new System.Drawing.Size(2560, 1830);
this.Controls.Add(this.tableLayoutPanel1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
- this.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+ this.Margin = new System.Windows.Forms.Padding(6);
this.Name = "FrmChainUp1";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "FrmChainUp";