1

FacOneZPStation/FrmZP.Designer.cs

@@ -77,7 +77,7 @@
             this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.51529F));
             this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.62445F));
             this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 32.86026F));
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 704F));
+            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 705F));
             this.tableLayoutPanel3.Controls.Add(this.button6, 3, 0);
             this.tableLayoutPanel3.Controls.Add(this.button1, 0, 1);
             this.tableLayoutPanel3.Controls.Add(this.button5, 2, 1);
@@ -102,10 +102,10 @@
             this.button6.Dock = System.Windows.Forms.DockStyle.Fill;
             this.button6.Font = new System.Drawing.Font("黑体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.button6.ForeColor = System.Drawing.Color.Black;
-            this.button6.Location = new System.Drawing.Point(1857, 14);
+            this.button6.Location = new System.Drawing.Point(1855, 14);
             this.button6.Margin = new System.Windows.Forms.Padding(14);
             this.button6.Name = "button6";
-            this.button6.Size = new System.Drawing.Size(677, 183);
+            this.button6.Size = new System.Drawing.Size(679, 183);
             this.button6.TabIndex = 7;
             this.button6.Text = "手动打印箱单";
             this.button6.UseVisualStyleBackColor = false;
@@ -119,7 +119,7 @@
             this.button1.Location = new System.Drawing.Point(6, 217);
             this.button1.Margin = new System.Windows.Forms.Padding(6);
             this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(606, 200);
+            this.button1.Size = new System.Drawing.Size(605, 200);
             this.button1.TabIndex = 6;
             this.button1.Text = "打印标签";
             this.button1.UseVisualStyleBackColor = false;
@@ -131,7 +131,7 @@
             this.button5.Dock = System.Windows.Forms.DockStyle.Fill;
             this.button5.Font = new System.Drawing.Font("黑体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.button5.ForeColor = System.Drawing.Color.Black;
-            this.button5.Location = new System.Drawing.Point(1252, 225);
+            this.button5.Location = new System.Drawing.Point(1250, 225);
             this.button5.Margin = new System.Windows.Forms.Padding(14);
             this.button5.Name = "button5";
             this.button5.Size = new System.Drawing.Size(577, 184);
@@ -145,10 +145,10 @@
             this.button4.BackColor = System.Drawing.Color.RoyalBlue;
             this.button4.Dock = System.Windows.Forms.DockStyle.Fill;
             this.button4.Font = new System.Drawing.Font("黑体", 16F);
-            this.button4.Location = new System.Drawing.Point(624, 6);
+            this.button4.Location = new System.Drawing.Point(623, 6);
             this.button4.Margin = new System.Windows.Forms.Padding(6);
             this.button4.Name = "button4";
-            this.button4.Size = new System.Drawing.Size(608, 199);
+            this.button4.Size = new System.Drawing.Size(607, 199);
             this.button4.TabIndex = 4;
             this.button4.Text = "下一计划";
             this.button4.UseVisualStyleBackColor = false;
@@ -162,7 +162,7 @@
             this.button3.Location = new System.Drawing.Point(6, 6);
             this.button3.Margin = new System.Windows.Forms.Padding(6);
             this.button3.Name = "button3";
-            this.button3.Size = new System.Drawing.Size(606, 199);
+            this.button3.Size = new System.Drawing.Size(605, 199);
             this.button3.TabIndex = 3;
             this.button3.Text = "上一计划";
             this.button3.UseVisualStyleBackColor = false;
@@ -174,10 +174,10 @@
             this.button2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.button2.Font = new System.Drawing.Font("黑体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.button2.ForeColor = System.Drawing.Color.Black;
-            this.button2.Location = new System.Drawing.Point(632, 225);
+            this.button2.Location = new System.Drawing.Point(631, 225);
             this.button2.Margin = new System.Windows.Forms.Padding(14);
             this.button2.Name = "button2";
-            this.button2.Size = new System.Drawing.Size(592, 184);
+            this.button2.Size = new System.Drawing.Size(591, 184);
             this.button2.TabIndex = 2;
             this.button2.Text = "补打标签";
             this.button2.UseVisualStyleBackColor = false;
@@ -188,10 +188,10 @@
             this.button7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
             this.button7.Dock = System.Windows.Forms.DockStyle.Fill;
             this.button7.Font = new System.Drawing.Font("黑体", 16F);
-            this.button7.Location = new System.Drawing.Point(1849, 217);
+            this.button7.Location = new System.Drawing.Point(1847, 217);
             this.button7.Margin = new System.Windows.Forms.Padding(6);
             this.button7.Name = "button7";
-            this.button7.Size = new System.Drawing.Size(693, 200);
+            this.button7.Size = new System.Drawing.Size(695, 200);
             this.button7.TabIndex = 8;
             this.button7.Text = "补打箱单";
             this.button7.UseVisualStyleBackColor = false;
@@ -203,7 +203,7 @@
             this.label7.Dock = System.Windows.Forms.DockStyle.Fill;
             this.label7.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label7.ForeColor = System.Drawing.Color.White;
-            this.label7.Location = new System.Drawing.Point(1525, 3);
+            this.label7.Location = new System.Drawing.Point(1523, 3);
             this.label7.Margin = new System.Windows.Forms.Padding(2);
             this.label7.Name = "label7";
             this.tableLayoutPanel4.SetRowSpan(this.label7, 2);
@@ -218,7 +218,7 @@
             this.textBox2.Location = new System.Drawing.Point(439, 127);
             this.textBox2.Margin = new System.Windows.Forms.Padding(4);
             this.textBox2.Name = "textBox2";
-            this.textBox2.Size = new System.Drawing.Size(1079, 87);
+            this.textBox2.Size = new System.Drawing.Size(1077, 87);
             this.textBox2.TabIndex = 30;
             this.textBox2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox2_KeyDown);
             // 
@@ -240,10 +240,10 @@
             this.labOrderNo.Dock = System.Windows.Forms.DockStyle.Fill;
             this.labOrderNo.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.labOrderNo.ForeColor = System.Drawing.Color.White;
-            this.labOrderNo.Location = new System.Drawing.Point(1802, 251);
+            this.labOrderNo.Location = new System.Drawing.Point(1800, 251);
             this.labOrderNo.Margin = new System.Windows.Forms.Padding(2);
             this.labOrderNo.Name = "labOrderNo";
-            this.labOrderNo.Size = new System.Drawing.Size(747, 175);
+            this.labOrderNo.Size = new System.Drawing.Size(749, 175);
             this.labOrderNo.TabIndex = 28;
             this.labOrderNo.Text = "A64654646464";
             this.labOrderNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -254,7 +254,7 @@
             this.label4.Dock = System.Windows.Forms.DockStyle.Fill;
             this.label4.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label4.ForeColor = System.Drawing.Color.White;
-            this.label4.Location = new System.Drawing.Point(1525, 251);
+            this.label4.Location = new System.Drawing.Point(1523, 251);
             this.label4.Margin = new System.Windows.Forms.Padding(2);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(272, 175);
@@ -271,7 +271,7 @@
             this.labStationNo.Location = new System.Drawing.Point(437, 251);
             this.labStationNo.Margin = new System.Windows.Forms.Padding(2);
             this.labStationNo.Name = "labStationNo";
-            this.labStationNo.Size = new System.Drawing.Size(1083, 175);
+            this.labStationNo.Size = new System.Drawing.Size(1081, 175);
             this.labStationNo.TabIndex = 26;
             this.labStationNo.Text = "V253-MF-S后保下部延伸焊接";
             this.labStationNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -295,10 +295,10 @@
             this.labPName.Dock = System.Windows.Forms.DockStyle.Fill;
             this.labPName.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.labPName.ForeColor = System.Drawing.Color.White;
-            this.labPName.Location = new System.Drawing.Point(1802, 431);
+            this.labPName.Location = new System.Drawing.Point(1800, 431);
             this.labPName.Margin = new System.Windows.Forms.Padding(2);
             this.labPName.Name = "labPName";
-            this.labPName.Size = new System.Drawing.Size(747, 286);
+            this.labPName.Size = new System.Drawing.Size(749, 286);
             this.labPName.TabIndex = 24;
             this.labPName.Text = "MF253 MF S后保";
             this.labPName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -309,7 +309,7 @@
             this.label8.Dock = System.Windows.Forms.DockStyle.Fill;
             this.label8.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label8.ForeColor = System.Drawing.Color.White;
-            this.label8.Location = new System.Drawing.Point(1525, 431);
+            this.label8.Location = new System.Drawing.Point(1523, 431);
             this.label8.Margin = new System.Windows.Forms.Padding(2);
             this.label8.Name = "label8";
             this.label8.Size = new System.Drawing.Size(272, 286);
@@ -326,7 +326,7 @@
             this.labPartNo.Location = new System.Drawing.Point(437, 431);
             this.labPartNo.Margin = new System.Windows.Forms.Padding(2);
             this.labPartNo.Name = "labPartNo";
-            this.labPartNo.Size = new System.Drawing.Size(1083, 286);
+            this.labPartNo.Size = new System.Drawing.Size(1081, 286);
             this.labPartNo.TabIndex = 22;
             this.labPartNo.Text = "A2530822665";
             this.labPartNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -356,10 +356,10 @@
             this.labBadCount.Dock = System.Windows.Forms.DockStyle.Fill;
             this.labBadCount.Font = new System.Drawing.Font("黑体", 60F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.labBadCount.ForeColor = System.Drawing.Color.Lime;
-            this.labBadCount.Location = new System.Drawing.Point(1802, 722);
+            this.labBadCount.Location = new System.Drawing.Point(1800, 722);
             this.labBadCount.Margin = new System.Windows.Forms.Padding(2);
             this.labBadCount.Name = "labBadCount";
-            this.labBadCount.Size = new System.Drawing.Size(747, 513);
+            this.labBadCount.Size = new System.Drawing.Size(749, 513);
             this.labBadCount.TabIndex = 20;
             this.labBadCount.Text = "0";
             this.labBadCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -373,7 +373,7 @@
             this.labNum.Location = new System.Drawing.Point(437, 722);
             this.labNum.Margin = new System.Windows.Forms.Padding(2);
             this.labNum.Name = "labNum";
-            this.labNum.Size = new System.Drawing.Size(1083, 513);
+            this.labNum.Size = new System.Drawing.Size(1081, 513);
             this.labNum.TabIndex = 18;
             this.labNum.Text = "152/210";
             this.labNum.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -412,7 +412,7 @@
             this.textBox1.Location = new System.Drawing.Point(439, 5);
             this.textBox1.Margin = new System.Windows.Forms.Padding(4);
             this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(1079, 87);
+            this.textBox1.Size = new System.Drawing.Size(1077, 87);
             this.textBox1.TabIndex = 13;
             this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown);
             // 
@@ -421,11 +421,11 @@
             this.labErrMessage.Dock = System.Windows.Forms.DockStyle.Fill;
             this.labErrMessage.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.labErrMessage.ForeColor = System.Drawing.Color.Red;
-            this.labErrMessage.Location = new System.Drawing.Point(1804, 1);
+            this.labErrMessage.Location = new System.Drawing.Point(1802, 1);
             this.labErrMessage.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.labErrMessage.Name = "labErrMessage";
             this.tableLayoutPanel4.SetRowSpan(this.labErrMessage, 2);
-            this.labErrMessage.Size = new System.Drawing.Size(743, 247);
+            this.labErrMessage.Size = new System.Drawing.Size(745, 247);
             this.labErrMessage.TabIndex = 16;
             this.labErrMessage.Text = "条码与产品不匹配，重新扫描";
             this.labErrMessage.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -438,7 +438,7 @@
             this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 28.52292F));
             this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 71.47708F));
             this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 276F));
-            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 750F));
+            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 752F));
             this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 40F));
             this.tableLayoutPanel4.Controls.Add(this.label7, 2, 0);
             this.tableLayoutPanel4.Controls.Add(this.textBox2, 1, 1);
@@ -478,7 +478,7 @@
             this.label12.Dock = System.Windows.Forms.DockStyle.Fill;
             this.label12.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label12.ForeColor = System.Drawing.Color.White;
-            this.label12.Location = new System.Drawing.Point(1525, 722);
+            this.label12.Location = new System.Drawing.Point(1523, 722);
             this.label12.Margin = new System.Windows.Forms.Padding(2);
             this.label12.Name = "label12";
             this.label12.Size = new System.Drawing.Size(272, 513);
@@ -491,10 +491,10 @@
             this.labTime.BackColor = System.Drawing.Color.Transparent;
             this.labTime.Dock = System.Windows.Forms.DockStyle.Fill;
             this.labTime.Font = new System.Drawing.Font("微软雅黑", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.labTime.Location = new System.Drawing.Point(1968, 0);
+            this.labTime.Location = new System.Drawing.Point(1967, 0);
             this.labTime.Margin = new System.Windows.Forms.Padding(0);
             this.labTime.Name = "labTime";
-            this.labTime.Size = new System.Drawing.Size(592, 149);
+            this.labTime.Size = new System.Drawing.Size(593, 149);
             this.labTime.TabIndex = 7;
             this.labTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             this.labTime.Click += new System.EventHandler(this.labTime_Click);
@@ -521,7 +521,7 @@
             this.label1.Location = new System.Drawing.Point(356, 0);
             this.label1.Margin = new System.Windows.Forms.Padding(0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(1612, 149);
+            this.label1.Size = new System.Drawing.Size(1611, 149);
             this.label1.TabIndex = 1;
             this.label1.Text = "装配工位信息看板";
             this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -532,7 +532,7 @@
             this.tableLayoutPanel2.ColumnCount = 3;
             this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 18.10651F));
             this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 81.89349F));
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 591F));
+            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 592F));
             this.tableLayoutPanel2.Controls.Add(this.labTime, 2, 0);
             this.tableLayoutPanel2.Controls.Add(this.pictureBox1, 0, 0);
             this.tableLayoutPanel2.Controls.Add(this.label1, 1, 0);

InjectionSearch/FrmBarCodeSearch2408.cs

@@ -1178,7 +1178,7 @@ namespace InjectionSearch
                         glacialList1.Items[i].SubItems[1].Tag = dt.Rows[i]["TableName"].ToString();
                     }
                 }
-
+                textBox5.Text = "";
             }
             catch (Exception ex)
             {

MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs

@@ -475,7 +475,7 @@ namespace MESClassLibrary.DAL.BasicInfo
             {
                 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.v_Code.CreateTime, dbo.v_Code.CreateTime as PrintTime, dbo.v_Code.OneBarCode, dbo.v_Code.PlanID, 
                 dbo.tb_InjectPlanReport.MaterialName, dbo.tb_InjectPlanReport.BatchNo
                 FROM dbo.v_Code with (NOLOCK) LEFT OUTER JOIN
                 dbo.tb_InjectPlanReport ON dbo.v_Code.PlanID = dbo.tb_InjectPlanReport.InjectionPlanID LEFT OUTER JOIN
@@ -500,7 +500,7 @@ namespace MESClassLibrary.DAL.BasicInfo
             {
                 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.v_Code.CreateTime as PrintTime, dbo.v_Code.OneBarCode,dbo.v_Code.PlanID, dbo.v_Code.TableName,
                             dbo.tb_InjectPlanReport.MaterialName, dbo.tb_InjectPlanReport.BatchNo
                             FROM dbo.v_Code LEFT OUTER JOIN
                             dbo.tb_InjectPlanReport ON dbo.v_Code.PlanID = dbo.tb_InjectPlanReport.InjectionPlanID LEFT OUTER JOIN
@@ -537,7 +537,7 @@ namespace MESClassLibrary.DAL.BasicInfo
 //                            ORDER BY dbo.tb_BarCode.CreateTime DESC";
                 string sql = @"SELECT  dbo.v_Code.BarCode, dbo.tb_Product.ProductName,  dbo.v_Code.BoxNo,  dbo.v_Code.TableName, 
                              CASE dbo.v_Code.PrintType WHEN 0 THEN '自动打印' WHEN 1 THEN '手动打印' WHEN 2 THEN '补打' END AS PrintType,
-                             dbo.v_Code.PrintTime, dbo.v_Code.OneBarCode,dbo.v_Code.PlanID, 
+                             dbo.v_Code.CreateTime as PrintTime, dbo.v_Code.OneBarCode,dbo.v_Code.PlanID, 
                             dbo.tb_InjectPlanReport.MaterialName, dbo.tb_InjectPlanReport.BatchNo
                             FROM dbo.v_Code LEFT OUTER JOIN
                             dbo.tb_InjectPlanReport ON dbo.v_Code.PlanID = dbo.tb_InjectPlanReport.InjectionPlanID LEFT OUTER JOIN