塑件替换

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, 681F));
+            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 683F));
             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(1666, 12);
+            this.button6.Location = new System.Drawing.Point(1663, 12);
             this.button6.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
             this.button6.Name = "button6";
-            this.button6.Size = new System.Drawing.Size(656, 161);
+            this.button6.Size = new System.Drawing.Size(659, 161);
             this.button6.TabIndex = 7;
             this.button6.Text = "手动打印箱单";
             this.button6.UseVisualStyleBackColor = false;
@@ -119,7 +119,7 @@
             this.button1.Location = new System.Drawing.Point(6, 190);
             this.button1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(542, 176);
+            this.button1.Size = new System.Drawing.Size(541, 176);
             this.button1.TabIndex = 6;
             this.button1.Text = "打印标签";
             this.button1.UseVisualStyleBackColor = false;
@@ -131,10 +131,10 @@
             this.button5.Dock = System.Windows.Forms.DockStyle.Fill;
             this.button5.Font = new System.Drawing.Font("黑体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.button5.ForeColor = System.Drawing.Color.Black;
-            this.button5.Location = new System.Drawing.Point(1123, 197);
+            this.button5.Location = new System.Drawing.Point(1121, 197);
             this.button5.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
             this.button5.Name = "button5";
-            this.button5.Size = new System.Drawing.Size(517, 162);
+            this.button5.Size = new System.Drawing.Size(516, 162);
             this.button5.TabIndex = 5;
             this.button5.Text = "不合格";
             this.button5.UseVisualStyleBackColor = false;
@@ -145,10 +145,10 @@
             this.button4.BackColor = System.Drawing.Color.RoyalBlue;
             this.button4.Dock = System.Windows.Forms.DockStyle.Fill;
             this.button4.Font = new System.Drawing.Font("黑体", 16F);
-            this.button4.Location = new System.Drawing.Point(560, 5);
+            this.button4.Location = new System.Drawing.Point(559, 5);
             this.button4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.button4.Name = "button4";
-            this.button4.Size = new System.Drawing.Size(544, 175);
+            this.button4.Size = new System.Drawing.Size(543, 175);
             this.button4.TabIndex = 4;
             this.button4.Text = "下一计划";
             this.button4.UseVisualStyleBackColor = false;
@@ -162,7 +162,7 @@
             this.button3.Location = new System.Drawing.Point(6, 5);
             this.button3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.button3.Name = "button3";
-            this.button3.Size = new System.Drawing.Size(542, 175);
+            this.button3.Size = new System.Drawing.Size(541, 175);
             this.button3.TabIndex = 3;
             this.button3.Text = "上一计划";
             this.button3.UseVisualStyleBackColor = false;
@@ -174,10 +174,10 @@
             this.button2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.button2.Font = new System.Drawing.Font("黑体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.button2.ForeColor = System.Drawing.Color.Black;
-            this.button2.Location = new System.Drawing.Point(567, 197);
+            this.button2.Location = new System.Drawing.Point(566, 197);
             this.button2.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
             this.button2.Name = "button2";
-            this.button2.Size = new System.Drawing.Size(530, 162);
+            this.button2.Size = new System.Drawing.Size(529, 162);
             this.button2.TabIndex = 2;
             this.button2.Text = "补打标签";
             this.button2.UseVisualStyleBackColor = false;
@@ -188,10 +188,10 @@
             this.button7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
             this.button7.Dock = System.Windows.Forms.DockStyle.Fill;
             this.button7.Font = new System.Drawing.Font("黑体", 16F);
-            this.button7.Location = new System.Drawing.Point(1659, 190);
+            this.button7.Location = new System.Drawing.Point(1656, 190);
             this.button7.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.button7.Name = "button7";
-            this.button7.Size = new System.Drawing.Size(670, 176);
+            this.button7.Size = new System.Drawing.Size(673, 176);
             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(1349, 3);
+            this.label7.Location = new System.Drawing.Point(1345, 3);
             this.label7.Margin = new System.Windows.Forms.Padding(2);
             this.label7.Name = "label7";
             this.tableLayoutPanel4.SetRowSpan(this.label7, 2);
@@ -215,10 +215,10 @@
             // 
             this.textBox2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.textBox2.Font = new System.Drawing.Font("黑体", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.textBox2.Location = new System.Drawing.Point(389, 111);
+            this.textBox2.Location = new System.Drawing.Point(388, 111);
-            this.textBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.textBox2.Margin = new System.Windows.Forms.Padding(4);
             this.textBox2.Name = "textBox2";
-            this.textBox2.Size = new System.Drawing.Size(953, 77);
+            this.textBox2.Size = new System.Drawing.Size(950, 77);
             this.textBox2.TabIndex = 30;
             this.textBox2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox2_KeyDown);
             // 
@@ -230,7 +230,7 @@
             this.label3.Location = new System.Drawing.Point(5, 107);
             this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(375, 109);
+            this.label3.Size = new System.Drawing.Size(374, 109);
             this.label3.TabIndex = 29;
             this.label3.Text = "扫描物料条码";
             this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -240,10 +240,10 @@
             this.labOrderNo.Dock = System.Windows.Forms.DockStyle.Fill;
             this.labOrderNo.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.labOrderNo.ForeColor = System.Drawing.Color.White;
-            this.labOrderNo.Location = new System.Drawing.Point(1603, 219);
+            this.labOrderNo.Location = new System.Drawing.Point(1599, 219);
             this.labOrderNo.Margin = new System.Windows.Forms.Padding(2);
             this.labOrderNo.Name = "labOrderNo";
-            this.labOrderNo.Size = new System.Drawing.Size(733, 152);
+            this.labOrderNo.Size = new System.Drawing.Size(737, 152);
             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(1349, 219);
+            this.label4.Location = new System.Drawing.Point(1345, 219);
             this.label4.Margin = new System.Windows.Forms.Padding(2);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(249, 152);
@@ -268,10 +268,10 @@
             this.labStationNo.Dock = System.Windows.Forms.DockStyle.Fill;
             this.labStationNo.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.labStationNo.ForeColor = System.Drawing.Color.White;
-            this.labStationNo.Location = new System.Drawing.Point(387, 219);
+            this.labStationNo.Location = new System.Drawing.Point(386, 219);
             this.labStationNo.Margin = new System.Windows.Forms.Padding(2);
             this.labStationNo.Name = "labStationNo";
-            this.labStationNo.Size = new System.Drawing.Size(957, 152);
+            this.labStationNo.Size = new System.Drawing.Size(954, 152);
             this.labStationNo.TabIndex = 26;
             this.labStationNo.Text = "V253-MF-S后保下部延伸焊接";
             this.labStationNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -285,7 +285,7 @@
             this.label2.Location = new System.Drawing.Point(3, 219);
             this.label2.Margin = new System.Windows.Forms.Padding(2);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(379, 152);
+            this.label2.Size = new System.Drawing.Size(378, 152);
             this.label2.TabIndex = 25;
             this.label2.Text = "工位名称";
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -295,10 +295,10 @@
             this.labPName.Dock = System.Windows.Forms.DockStyle.Fill;
             this.labPName.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.labPName.ForeColor = System.Drawing.Color.White;
-            this.labPName.Location = new System.Drawing.Point(1603, 376);
+            this.labPName.Location = new System.Drawing.Point(1599, 376);
             this.labPName.Margin = new System.Windows.Forms.Padding(2);
             this.labPName.Name = "labPName";
-            this.labPName.Size = new System.Drawing.Size(733, 249);
+            this.labPName.Size = new System.Drawing.Size(737, 249);
             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(1349, 376);
+            this.label8.Location = new System.Drawing.Point(1345, 376);
             this.label8.Margin = new System.Windows.Forms.Padding(2);
             this.label8.Name = "label8";
             this.label8.Size = new System.Drawing.Size(249, 249);
@@ -323,10 +323,10 @@
             this.labPartNo.Dock = System.Windows.Forms.DockStyle.Fill;
             this.labPartNo.Font = new System.Drawing.Font("黑体", 42F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.labPartNo.ForeColor = System.Drawing.Color.White;
-            this.labPartNo.Location = new System.Drawing.Point(387, 376);
+            this.labPartNo.Location = new System.Drawing.Point(386, 376);
             this.labPartNo.Margin = new System.Windows.Forms.Padding(2);
             this.labPartNo.Name = "labPartNo";
-            this.labPartNo.Size = new System.Drawing.Size(957, 249);
+            this.labPartNo.Size = new System.Drawing.Size(954, 249);
             this.labPartNo.TabIndex = 22;
             this.labPartNo.Text = "A2530822665";
             this.labPartNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -345,7 +345,7 @@
             this.label6.Location = new System.Drawing.Point(3, 376);
             this.label6.Margin = new System.Windows.Forms.Padding(2);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(379, 249);
+            this.label6.Size = new System.Drawing.Size(378, 249);
             this.label6.TabIndex = 21;
             this.label6.Text = "产品代码";
             this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -356,10 +356,10 @@
             this.labBadCount.Dock = System.Windows.Forms.DockStyle.Fill;
             this.labBadCount.Font = new System.Drawing.Font("黑体", 60F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.labBadCount.ForeColor = System.Drawing.Color.Lime;
-            this.labBadCount.Location = new System.Drawing.Point(1603, 630);
+            this.labBadCount.Location = new System.Drawing.Point(1599, 630);
             this.labBadCount.Margin = new System.Windows.Forms.Padding(2);
             this.labBadCount.Name = "labBadCount";
-            this.labBadCount.Size = new System.Drawing.Size(733, 449);
+            this.labBadCount.Size = new System.Drawing.Size(737, 449);
             this.labBadCount.TabIndex = 20;
             this.labBadCount.Text = "0";
             this.labBadCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -370,10 +370,10 @@
             this.labNum.Dock = System.Windows.Forms.DockStyle.Fill;
             this.labNum.Font = new System.Drawing.Font("黑体", 60F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.labNum.ForeColor = System.Drawing.Color.Lime;
-            this.labNum.Location = new System.Drawing.Point(387, 630);
+            this.labNum.Location = new System.Drawing.Point(386, 630);
             this.labNum.Margin = new System.Windows.Forms.Padding(2);
             this.labNum.Name = "labNum";
-            this.labNum.Size = new System.Drawing.Size(957, 449);
+            this.labNum.Size = new System.Drawing.Size(954, 449);
             this.labNum.TabIndex = 18;
             this.labNum.Text = "152/210";
             this.labNum.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -387,7 +387,7 @@
             this.label10.Location = new System.Drawing.Point(3, 630);
             this.label10.Margin = new System.Windows.Forms.Padding(2);
             this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(379, 449);
+            this.label10.Size = new System.Drawing.Size(378, 449);
             this.label10.TabIndex = 17;
             this.label10.Text = "计划/完成数";
             this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -400,7 +400,7 @@
             this.label14.Location = new System.Drawing.Point(5, 1);
             this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label14.Name = "label14";
-            this.label14.Size = new System.Drawing.Size(375, 105);
+            this.label14.Size = new System.Drawing.Size(374, 105);
             this.label14.TabIndex = 12;
             this.label14.Text = "扫描本体条码";
             this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -409,10 +409,10 @@
             // 
             this.textBox1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.textBox1.Font = new System.Drawing.Font("黑体", 26.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.textBox1.Location = new System.Drawing.Point(389, 5);
+            this.textBox1.Location = new System.Drawing.Point(388, 5);
-            this.textBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.textBox1.Margin = new System.Windows.Forms.Padding(4);
             this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(953, 77);
+            this.textBox1.Size = new System.Drawing.Size(950, 77);
             this.textBox1.TabIndex = 13;
             this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown);
             // 
@@ -421,11 +421,11 @@
             this.labErrMessage.Dock = System.Windows.Forms.DockStyle.Fill;
             this.labErrMessage.Font = new System.Drawing.Font("微软雅黑", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.labErrMessage.ForeColor = System.Drawing.Color.Red;
-            this.labErrMessage.Location = new System.Drawing.Point(1605, 1);
+            this.labErrMessage.Location = new System.Drawing.Point(1601, 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(729, 215);
+            this.labErrMessage.Size = new System.Drawing.Size(733, 215);
             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, 253F));
-            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 736F));
+            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 740F));
             this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 37F));
             this.tableLayoutPanel4.Controls.Add(this.label7, 2, 0);
             this.tableLayoutPanel4.Controls.Add(this.textBox2, 1, 1);
@@ -460,7 +460,7 @@
             this.tableLayoutPanel4.Controls.Add(this.labErrMessage, 3, 0);
             this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 134);
-            this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4);
             this.tableLayoutPanel4.Name = "tableLayoutPanel4";
             this.tableLayoutPanel4.RowCount = 5;
             this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.8932F));
@@ -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(1349, 630);
+            this.label12.Location = new System.Drawing.Point(1345, 630);
             this.label12.Margin = new System.Windows.Forms.Padding(2);
             this.label12.Name = "label12";
             this.label12.Size = new System.Drawing.Size(249, 449);
@@ -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(1780, 0);
+            this.labTime.Location = new System.Drawing.Point(1778, 0);
             this.labTime.Margin = new System.Windows.Forms.Padding(0);
             this.labTime.Name = "labTime";
-            this.labTime.Size = new System.Drawing.Size(567, 130);
+            this.labTime.Size = new System.Drawing.Size(569, 130);
             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(322, 0);
             this.label1.Margin = new System.Windows.Forms.Padding(0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(1458, 130);
+            this.label1.Size = new System.Drawing.Size(1456, 130);
             this.label1.TabIndex = 1;
             this.label1.Text = "装配工位信息看板";
             this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -532,7 +532,7 @@
             this.tableLayoutPanel2.ColumnCount = 3;
             this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 18.10651F));
             this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 81.89349F));
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 566F));
+            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 568F));
             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/FrmBarCodeReplace.cs

@@ -114,8 +114,13 @@ namespace InjectionSearch
                 model.PlanID = oldTable.Rows[0]["PlanID"].ToString();
                 //_badInjectionBLL.Add_Info(model);
                 string stationID = dt.Rows[0]["StationID"].ToString()?.Trim();
-                //string stationNo = _stationBLL.SearchStationNameByID(stationID); 
+                string stationNo = stationID;
-                _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, stationID);
+                if (stationID.Length > 10)
+                {
+                      stationNo = _stationBLL.SearchStationNameByID(stationID); 
+                }
+
+                _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, stationNo);
 
                 MessageBox.Show($"替换成功.原条码[{oldCode}]已与箱码解绑.");
                 this.Close();

MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs

@@ -459,8 +459,7 @@ namespace MESClassLibrary.BLL.BasicInfo
                     localDB.Rollback();
                 }
                 LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
-                
+                throw ex;
-                return false;
             }
             finally
             {

MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs

@@ -496,7 +496,7 @@ namespace MESClassLibrary.DAL.BasicInfo
                 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)
+                WHERE   (dbo.v_Code.IsDel = 0) and IsNull(v_Code.BoxNo,'')!='' 
                 ORDER BY dbo.v_Code.CreateTime DESC";
 
                 return SqlHelper.ExecuteDataset(SqlHelper.GetConnSting(), CommandType.Text, sql, null).Tables[0];
@@ -521,7 +521,7 @@ namespace MESClassLibrary.DAL.BasicInfo
                             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
+                            WHERE dbo.v_Code.IsDel = 0  and dbo.v_Code.OneBarCode=@OneBarCode  and IsNull( BoxNo ,'')!=''
                             ORDER BY dbo.v_Code.CreateTime DESC";
 
                 SqlParameter[] param = new SqlParameter[1];

WebService/Function.cs

@@ -1358,19 +1358,19 @@ namespace Webservice
             }
 
             string lastState = inspectTable.Rows[1]["inspectResult"].ToString();
-            if(lastState == "打磨")
+            if(lastState.Contains("打磨"))
             {
                 return 1;
             }
-            else if (lastState.ToUpper() == "打磨WMS")
+            else if (lastState.ToUpper().Contains("打磨WMS"))
             {
                 return 2;
             }
-            else if (lastState.ToUpper() == "其它WMS")
+            else if (lastState.ToUpper().Contains("其它WMS"))
             {
                 return 3;
             }
-            else if (lastState == "其它")
+            else if (lastState.Contains("其它"))
             {
                 return 4;
             }