注塑打码的修改

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, 662F));
+            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 726F));
             this.tableLayoutPanel3.Controls.Add(this.button6, 3, 0);
             this.tableLayoutPanel3.Controls.Add(this.button1, 0, 1);
             this.tableLayoutPanel3.Controls.Add(this.button5, 2, 1);
@@ -86,14 +86,14 @@
             this.tableLayoutPanel3.Controls.Add(this.button2, 1, 1);
             this.tableLayoutPanel3.Controls.Add(this.button7, 3, 1);
             this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tableLayoutPanel3.Location = new System.Drawing.Point(6, 1225);
+            this.tableLayoutPanel3.Location = new System.Drawing.Point(7, 1401);
-            this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
             this.tableLayoutPanel3.Name = "tableLayoutPanel3";
             this.tableLayoutPanel3.RowCount = 2;
             this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
             this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35F));
+            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F));
-            this.tableLayoutPanel3.Size = new System.Drawing.Size(2335, 371);
+            this.tableLayoutPanel3.Size = new System.Drawing.Size(2546, 423);
             this.tableLayoutPanel3.TabIndex = 3;
             // 
             // button6
@@ -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(1684, 12);
+            this.button6.Location = new System.Drawing.Point(1832, 14);
-            this.button6.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
+            this.button6.Margin = new System.Windows.Forms.Padding(14);
             this.button6.Name = "button6";
-            this.button6.Size = new System.Drawing.Size(638, 161);
+            this.button6.Size = new System.Drawing.Size(700, 183);
             this.button6.TabIndex = 7;
             this.button6.Text = "手动打印箱单";
             this.button6.UseVisualStyleBackColor = false;
@@ -116,10 +116,10 @@
             this.button1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
             this.button1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.button1.Font = new System.Drawing.Font("黑体", 16F);
-            this.button1.Location = new System.Drawing.Point(6, 190);
+            this.button1.Location = new System.Drawing.Point(7, 217);
-            this.button1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.button1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
             this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(548, 176);
+            this.button1.Size = new System.Drawing.Size(595, 200);
             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(1135, 197);
+            this.button5.Location = new System.Drawing.Point(1234, 225);
-            this.button5.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
+            this.button5.Margin = new System.Windows.Forms.Padding(14);
             this.button5.Name = "button5";
-            this.button5.Size = new System.Drawing.Size(523, 162);
+            this.button5.Size = new System.Drawing.Size(570, 184);
             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(566, 5);
+            this.button4.Location = new System.Drawing.Point(616, 6);
-            this.button4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.button4.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
             this.button4.Name = "button4";
-            this.button4.Size = new System.Drawing.Size(550, 175);
+            this.button4.Size = new System.Drawing.Size(597, 199);
             this.button4.TabIndex = 4;
             this.button4.Text = "下一计划";
             this.button4.UseVisualStyleBackColor = false;
@@ -159,10 +159,10 @@
             this.button3.BackColor = System.Drawing.Color.Aqua;
             this.button3.Dock = System.Windows.Forms.DockStyle.Fill;
             this.button3.Font = new System.Drawing.Font("黑体", 16F);
-            this.button3.Location = new System.Drawing.Point(6, 5);
+            this.button3.Location = new System.Drawing.Point(7, 6);
-            this.button3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.button3.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
             this.button3.Name = "button3";
-            this.button3.Size = new System.Drawing.Size(548, 175);
+            this.button3.Size = new System.Drawing.Size(595, 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(573, 197);
+            this.button2.Location = new System.Drawing.Point(623, 225);
-            this.button2.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
+            this.button2.Margin = new System.Windows.Forms.Padding(14);
             this.button2.Name = "button2";
-            this.button2.Size = new System.Drawing.Size(536, 162);
+            this.button2.Size = new System.Drawing.Size(583, 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(1677, 190);
+            this.button7.Location = new System.Drawing.Point(1825, 217);
-            this.button7.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.button7.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
             this.button7.Name = "button7";
-            this.button7.Size = new System.Drawing.Size(652, 176);
+            this.button7.Size = new System.Drawing.Size(714, 200);
             this.button7.TabIndex = 8;
             this.button7.Text = "补打箱单";
             this.button7.UseVisualStyleBackColor = false;
@@ -203,11 +203,11 @@
             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(1374, 3);
+            this.label7.Location = new System.Drawing.Point(1495, 3);
             this.label7.Margin = new System.Windows.Forms.Padding(2);
             this.label7.Name = "label7";
             this.tableLayoutPanel4.SetRowSpan(this.label7, 2);
-            this.label7.Size = new System.Drawing.Size(249, 211);
+            this.label7.Size = new System.Drawing.Size(272, 241);
             this.label7.TabIndex = 32;
             this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
@@ -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(396, 111);
+            this.textBox2.Location = new System.Drawing.Point(431, 127);
-            this.textBox2.Margin = new System.Windows.Forms.Padding(4);
+            this.textBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.textBox2.Name = "textBox2";
-            this.textBox2.Size = new System.Drawing.Size(971, 77);
+            this.textBox2.Size = new System.Drawing.Size(1057, 87);
             this.textBox2.TabIndex = 30;
             this.textBox2.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox2_KeyDown);
             // 
@@ -227,10 +227,10 @@
             this.label3.Dock = System.Windows.Forms.DockStyle.Fill;
             this.label3.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label3.ForeColor = System.Drawing.Color.White;
-            this.label3.Location = new System.Drawing.Point(5, 107);
+            this.label3.Location = new System.Drawing.Point(5, 122);
             this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(382, 109);
+            this.label3.Size = new System.Drawing.Size(417, 124);
             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(1628, 219);
+            this.labOrderNo.Location = new System.Drawing.Point(1772, 249);
             this.labOrderNo.Margin = new System.Windows.Forms.Padding(2);
             this.labOrderNo.Name = "labOrderNo";
-            this.labOrderNo.Size = new System.Drawing.Size(708, 152);
+            this.labOrderNo.Size = new System.Drawing.Size(777, 174);
             this.labOrderNo.TabIndex = 28;
             this.labOrderNo.Text = "A64654646464";
             this.labOrderNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -254,10 +254,10 @@
             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(1374, 219);
+            this.label4.Location = new System.Drawing.Point(1495, 249);
             this.label4.Margin = new System.Windows.Forms.Padding(2);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(249, 152);
+            this.label4.Size = new System.Drawing.Size(272, 174);
             this.label4.TabIndex = 27;
             this.label4.Text = "计划编号";
             this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -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(394, 219);
+            this.labStationNo.Location = new System.Drawing.Point(429, 249);
             this.labStationNo.Margin = new System.Windows.Forms.Padding(2);
             this.labStationNo.Name = "labStationNo";
-            this.labStationNo.Size = new System.Drawing.Size(975, 152);
+            this.labStationNo.Size = new System.Drawing.Size(1061, 174);
             this.labStationNo.TabIndex = 26;
             this.labStationNo.Text = "V253-MF-S后保下部延伸焊接";
             this.labStationNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -282,10 +282,10 @@
             this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.label2.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label2.ForeColor = System.Drawing.Color.White;
-            this.label2.Location = new System.Drawing.Point(3, 219);
+            this.label2.Location = new System.Drawing.Point(3, 249);
             this.label2.Margin = new System.Windows.Forms.Padding(2);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(386, 152);
+            this.label2.Size = new System.Drawing.Size(421, 174);
             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(1628, 376);
+            this.labPName.Location = new System.Drawing.Point(1772, 428);
             this.labPName.Margin = new System.Windows.Forms.Padding(2);
             this.labPName.Name = "labPName";
-            this.labPName.Size = new System.Drawing.Size(708, 249);
+            this.labPName.Size = new System.Drawing.Size(777, 285);
             this.labPName.TabIndex = 24;
             this.labPName.Text = "MF253 MF S后保";
             this.labPName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -309,10 +309,10 @@
             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(1374, 376);
+            this.label8.Location = new System.Drawing.Point(1495, 428);
             this.label8.Margin = new System.Windows.Forms.Padding(2);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(249, 249);
+            this.label8.Size = new System.Drawing.Size(272, 285);
             this.label8.TabIndex = 23;
             this.label8.Text = "产品名称";
             this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -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(394, 376);
+            this.labPartNo.Location = new System.Drawing.Point(429, 428);
             this.labPartNo.Margin = new System.Windows.Forms.Padding(2);
             this.labPartNo.Name = "labPartNo";
-            this.labPartNo.Size = new System.Drawing.Size(975, 249);
+            this.labPartNo.Size = new System.Drawing.Size(1061, 285);
             this.labPartNo.TabIndex = 22;
             this.labPartNo.Text = "A2530822665";
             this.labPartNo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -342,10 +342,10 @@
             this.label6.Dock = System.Windows.Forms.DockStyle.Fill;
             this.label6.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label6.ForeColor = System.Drawing.Color.White;
-            this.label6.Location = new System.Drawing.Point(3, 376);
+            this.label6.Location = new System.Drawing.Point(3, 428);
             this.label6.Margin = new System.Windows.Forms.Padding(2);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(386, 249);
+            this.label6.Size = new System.Drawing.Size(421, 285);
             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(1628, 630);
+            this.labBadCount.Location = new System.Drawing.Point(1772, 718);
             this.labBadCount.Margin = new System.Windows.Forms.Padding(2);
             this.labBadCount.Name = "labBadCount";
-            this.labBadCount.Size = new System.Drawing.Size(708, 449);
+            this.labBadCount.Size = new System.Drawing.Size(777, 515);
             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(394, 630);
+            this.labNum.Location = new System.Drawing.Point(429, 718);
             this.labNum.Margin = new System.Windows.Forms.Padding(2);
             this.labNum.Name = "labNum";
-            this.labNum.Size = new System.Drawing.Size(975, 449);
+            this.labNum.Size = new System.Drawing.Size(1061, 515);
             this.labNum.TabIndex = 18;
             this.labNum.Text = "152/210";
             this.labNum.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -384,10 +384,10 @@
             this.label10.Dock = System.Windows.Forms.DockStyle.Fill;
             this.label10.Font = new System.Drawing.Font("黑体", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label10.ForeColor = System.Drawing.Color.White;
-            this.label10.Location = new System.Drawing.Point(3, 630);
+            this.label10.Location = new System.Drawing.Point(3, 718);
             this.label10.Margin = new System.Windows.Forms.Padding(2);
             this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(386, 449);
+            this.label10.Size = new System.Drawing.Size(421, 515);
             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(382, 105);
+            this.label14.Size = new System.Drawing.Size(417, 120);
             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(396, 5);
+            this.textBox1.Location = new System.Drawing.Point(431, 6);
-            this.textBox1.Margin = new System.Windows.Forms.Padding(4);
+            this.textBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(971, 77);
+            this.textBox1.Size = new System.Drawing.Size(1057, 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(1630, 1);
+            this.labErrMessage.Location = new System.Drawing.Point(1774, 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(704, 215);
+            this.labErrMessage.Size = new System.Drawing.Size(773, 245);
             this.labErrMessage.TabIndex = 16;
             this.labErrMessage.Text = "条码与产品不匹配，重新扫描";
             this.labErrMessage.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -437,9 +437,9 @@
             this.tableLayoutPanel4.ColumnCount = 4;
             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, 276F));
-            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 711F));
+            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 780F));
-            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 37F));
+            this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 40F));
             this.tableLayoutPanel4.Controls.Add(this.label7, 2, 0);
             this.tableLayoutPanel4.Controls.Add(this.textBox2, 1, 1);
             this.tableLayoutPanel4.Controls.Add(this.label3, 0, 1);
@@ -459,17 +459,17 @@
             this.tableLayoutPanel4.Controls.Add(this.textBox1, 1, 0);
             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.Location = new System.Drawing.Point(4, 154);
-            this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4);
+            this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.tableLayoutPanel4.Name = "tableLayoutPanel4";
             this.tableLayoutPanel4.RowCount = 5;
             this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.8932F));
             this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 17.47573F));
             this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
             this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 40.52419F));
-            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 452F));
+            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 517F));
-            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35F));
+            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F));
-            this.tableLayoutPanel4.Size = new System.Drawing.Size(2339, 1082);
+            this.tableLayoutPanel4.Size = new System.Drawing.Size(2552, 1236);
             this.tableLayoutPanel4.TabIndex = 2;
             // 
             // label12
@@ -478,10 +478,10 @@
             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(1374, 630);
+            this.label12.Location = new System.Drawing.Point(1495, 718);
             this.label12.Margin = new System.Windows.Forms.Padding(2);
             this.label12.Name = "label12";
-            this.label12.Size = new System.Drawing.Size(249, 449);
+            this.label12.Size = new System.Drawing.Size(272, 515);
             this.label12.TabIndex = 19;
             this.label12.Text = "不合格数";
             this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -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(1792, 0);
+            this.labTime.Location = new System.Drawing.Point(1953, 0);
             this.labTime.Margin = new System.Windows.Forms.Padding(0);
             this.labTime.Name = "labTime";
-            this.labTime.Size = new System.Drawing.Size(555, 130);
+            this.labTime.Size = new System.Drawing.Size(607, 149);
             this.labTime.TabIndex = 7;
             this.labTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             this.labTime.Click += new System.EventHandler(this.labTime_Click);
@@ -508,7 +508,7 @@
             this.pictureBox1.Location = new System.Drawing.Point(0, 0);
             this.pictureBox1.Margin = new System.Windows.Forms.Padding(0);
             this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(324, 130);
+            this.pictureBox1.Size = new System.Drawing.Size(353, 149);
             this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
             this.pictureBox1.TabIndex = 0;
             this.pictureBox1.TabStop = false;
@@ -518,10 +518,10 @@
             this.label1.BackColor = System.Drawing.Color.Transparent;
             this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.label1.Font = new System.Drawing.Font("黑体", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(324, 0);
+            this.label1.Location = new System.Drawing.Point(353, 0);
             this.label1.Margin = new System.Windows.Forms.Padding(0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(1468, 130);
+            this.label1.Size = new System.Drawing.Size(1600, 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, 554F));
+            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 606F));
             this.tableLayoutPanel2.Controls.Add(this.labTime, 2, 0);
             this.tableLayoutPanel2.Controls.Add(this.pictureBox1, 0, 0);
             this.tableLayoutPanel2.Controls.Add(this.label1, 1, 0);
@@ -542,7 +542,7 @@
             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(2347, 130);
+            this.tableLayoutPanel2.Size = new System.Drawing.Size(2560, 149);
             this.tableLayoutPanel2.TabIndex = 0;
             // 
             // tableLayoutPanel1
@@ -559,18 +559,18 @@
             this.tableLayoutPanel1.RowCount = 3;
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10.69692F));
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 89.30308F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 380F));
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 434F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(2347, 1601);
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(2560, 1830);
             this.tableLayoutPanel1.TabIndex = 9;
             // 
             // FrmZP
             // 
-            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, 1601);
+            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, 5, 6, 5);
+            this.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
             this.Name = "FrmZP";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "FrmZP";

InjectionPC/FrmMain2408.cs

@@ -2994,23 +2994,39 @@ namespace InjectionPC
                 }
                 else
                 {
-                    DialogResult result = MessageBox.Show("确定补打条码？", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Information);
+                    GlacialComponents.Controls.GLItem gv;
+                    gv = glacialList1.SelectedItems[0] as GlacialComponents.Controls.GLItem;
+                    code = gv.Text;
+                    DialogResult result = MessageBox.Show($"补打条码[{code}]将被新的替换,确定补打条码？", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Information);
                     if (result == DialogResult.OK)
                     {
-                        GlacialComponents.Controls.GLItem gv;
+
-                        gv = glacialList1.SelectedItems[0] as GlacialComponents.Controls.GLItem;
+                        bool exsitWms = _wmsBll.IsReadBarCodeInWms(code);
-                        code = gv.Text;
+                        if (exsitWms)
+                        {
+                            MessageBox.Show($"条码[{code}]在WMS系统已处理,无法补打!");
+                            return;
+                        }
 
                         DataTable dt = bll.SearchInfoByBarCodeNew(code, Program.tableName);
                         if (dt != null && dt.Rows.Count > 0)
                         {
                             md.ID = Guid.NewGuid().ToString();
-                            md.BarCode = code;
+                            //md.BarCode = code;
                             md.StationID = dt.Rows[0]["StationID"].ToString();
                             md.StockNo = dt.Rows[0]["StockNo"].ToString();
-                            md.OneBarCode = dt.Rows[0]["OneBarCode"].ToString();
-                            //md.BoxNo = dt.Rows[0]["BoxNo"].ToString();
                             md.PartNo = dt.Rows[0]["PartNo"].ToString();
+                            md.BatchNo = dt.Rows[0]["BatchNo"].ToString();
+                            string newOneCode = string.Empty;
+                            string newBarCode = string.Empty;
+                            GetBarCode(md.StockNo, md.BatchNo, md.PartNo, ref newOneCode, ref newBarCode);
+                            md.OneBarCode = newOneCode; 
+                            md.BarCode = newBarCode;
+                            md.BoxNo = dt.Rows[0]["BoxNo"].ToString();
+                            if (gv.SubItems.Count > 1)
+                            {
+                                md.Des1 = gv.SubItems[1].Text;
+                            }
 
                             md.PrintType = 2;
 
@@ -3038,11 +3054,16 @@ namespace InjectionPC
                             return;
                         }
 
-                        if (bll.Add_Info_New(md, Program.tableName) == false)
+                        string msg = bll.ReprintSave(md, Program.tableName, dt.Rows[0]["OneBarCode"].ToString(), dt.Rows[0]["BarCode"].ToString());
-                        // if (SaveBarCode(md, Program.tableName, true) == false) 补打不装箱
+                        if (!string.IsNullOrEmpty(msg))
                         {
+                            MessageBox.Show($"补打失败,原因:" + msg);
                             return;
                         }
+                        //if (bll.Add_Info_New(md, Program.tableName) == false)
+                        //{
+                        //    return;
+                        //}
                         glacialList1.SelectedItems.Clear();
                         initBarCode();
 
@@ -4397,12 +4418,16 @@ namespace InjectionPC
             CheckPackageCode(partNo, autoPrint, mould, partName);
 
             string batch = GetBatch(autoPrint);
-           
+            GetBarCode(stockNo, batch, partNo, ref newOneCode, ref newCode);
+            // newOneCode = _uniqueBll.GetSjBarCodeSerialNo(stockNo, batch);
+            //newCode = partNo + "." + batch + "." + newOneCode.Substring(newOneCode.Length - 4, 4);
+        }
+        void GetBarCode(string stockNo,string batch,string partNo,ref string newOneCode, ref string newCode)
+        {
             newOneCode = _uniqueBll.GetSjBarCodeSerialNo(stockNo, batch);
             newCode = partNo + "." + batch + "." + newOneCode.Substring(newOneCode.Length - 4, 4);
         }
 
-
         string GetPackageCode(string partNo,bool autoPrint )
         {
             string batch = GetBatch(autoPrint);

InjectionPC/FrmMain2411.cs

@@ -2926,7 +2926,7 @@ namespace InjectionPC
         /// <param name="e"></param>
         private void label22_Click(object sender, EventArgs e)
         {
-            string code = "", filename = "", printName = "", ManufacturerName="";
+            string code = "", filename = "", printName = "", ManufacturerName = "";
             BarCodeModel md = new BarCodeModel();
             BarCodeBLL bll = new BarCodeBLL();
             ProductBLL pbll = new ProductBLL();
@@ -2940,23 +2940,39 @@ namespace InjectionPC
                 }
                 else
                 {
-                    DialogResult result = MessageBox.Show("确定补打条码？", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Information);
+                    GlacialComponents.Controls.GLItem gv;
+                    gv = glacialList1.SelectedItems[0] as GlacialComponents.Controls.GLItem;
+                    code = gv.Text;
+                    DialogResult result = MessageBox.Show($"补打条码[{code}]将被新的替换,确定补打条码？", "提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Information);
                     if (result == DialogResult.OK)
                     {
-                        GlacialComponents.Controls.GLItem gv;
+
-                        gv = glacialList1.SelectedItems[0] as GlacialComponents.Controls.GLItem;
+                        bool exsitWms = _wmsBll.IsReadBarCodeInWms(code);
-                        code = gv.Text;
+                        if (exsitWms)
+                        {
+                            MessageBox.Show($"条码[{code}]在WMS系统已处理,无法补打!");
+                            return;
+                        }
 
                         DataTable dt = bll.SearchInfoByBarCodeNew(code, Program.tableName);
                         if (dt != null && dt.Rows.Count > 0)
                         {
                             md.ID = Guid.NewGuid().ToString();
-                            md.BarCode = code;
+                            //md.BarCode = code;
                             md.StationID = dt.Rows[0]["StationID"].ToString();
                             md.StockNo = dt.Rows[0]["StockNo"].ToString();
-                            md.OneBarCode = dt.Rows[0]["OneBarCode"].ToString();
-                            //md.BoxNo = dt.Rows[0]["BoxNo"].ToString();
                             md.PartNo = dt.Rows[0]["PartNo"].ToString();
+                            md.BatchNo = dt.Rows[0]["BatchNo"].ToString();
+                            string newOneCode = string.Empty;
+                            string newBarCode = string.Empty;
+                            GetBarCode(md.StockNo, md.BatchNo, md.PartNo, ref newOneCode, ref newBarCode);
+                            md.OneBarCode = newOneCode;
+                            md.BarCode = newBarCode;
+                            md.BoxNo = dt.Rows[0]["BoxNo"].ToString();
+                            if (gv.SubItems.Count > 1)
+                            {
+                                md.Des1 = gv.SubItems[1].Text;
+                            }
 
                             md.PrintType = 2;
 
@@ -2984,11 +3000,16 @@ namespace InjectionPC
                             return;
                         }
 
-                        if (bll.Add_Info_New(md, Program.tableName) == false)
+                        string msg = bll.ReprintSave(md, Program.tableName, dt.Rows[0]["OneBarCode"].ToString(), dt.Rows[0]["BarCode"].ToString());
-                        // if (SaveBarCode(md, Program.tableName, true) == false) 补打不装箱
+                        if (!string.IsNullOrEmpty(msg))
                         {
+                            MessageBox.Show($"补打失败,原因:" + msg);
                             return;
                         }
+                        //if (bll.Add_Info_New(md, Program.tableName) == false)
+                        //{
+                        //    return;
+                        //}
                         glacialList1.SelectedItems.Clear();
                         initBarCode();
 
@@ -3006,7 +3027,7 @@ namespace InjectionPC
                             filename = AppDomain.CurrentDomain.BaseDirectory +
                                        "Sill.grf";
                         }
-                      
+
                         string partName = "";
                         DataTable dt2 = pbll.SearchInfoByPartNo(md.PartNo);
                         if (dt2 != null && dt2.Rows.Count > 0)
@@ -3031,7 +3052,7 @@ namespace InjectionPC
 
 
                         ReportHelper rp = new ReportHelper(filename, headTable, null,
-                            (int) GRPaperOrientation.grpoDefault, 1, reportName);
+                            (int)GRPaperOrientation.grpoDefault, 1, reportName);
                         LogSysBLL.AddInfo(GetDateTime().ToString("yyyy/MM/dd HH:mm:ss") + md.OneBarCode, MethodBase.GetCurrentMethod());
                         rp.Report.Print(false);
 
@@ -3044,7 +3065,6 @@ namespace InjectionPC
                 LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
             }
         }
-
         /// <summary>
         /// 补打箱单
         /// </summary>
@@ -4165,11 +4185,16 @@ namespace InjectionPC
         void GetSjBarCode(string stockNo,string partNo, bool autoPrint,string mould,string partName, ref string newOneCode,ref string newCode)
         {
             string batch = GetBatch(autoPrint);
+            GetBarCode(stockNo, batch, partNo, ref newOneCode, ref newCode);
+            //newOneCode = _uniqueBll.GetSjBarCodeSerialNo(stockNo, batch);
+            //newCode = partNo + "." + batch + "." + newOneCode.Substring(newOneCode.Length - 4, 4);
+        }
+        void GetBarCode(string stockNo, string batch, string partNo, ref string newOneCode, ref string newCode)
+        {
             newOneCode = _uniqueBll.GetSjBarCodeSerialNo(stockNo, batch);
             newCode = partNo + "." + batch + "." + newOneCode.Substring(newOneCode.Length - 4, 4);
         }
 
-     
         string GetBatch(bool isAutoPrint)
         {
             string batch = string.Empty;

MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs

@@ -99,6 +99,8 @@ namespace MESClassLibrary.BLL.BasicInfo
                 return false;
             }
         }
+
+
         public bool Add_Info_New(LocalDBService local, BarCodeModel md, string tableName)
         {
             try
@@ -111,6 +113,62 @@ namespace MESClassLibrary.BLL.BasicInfo
                 return false;
             }
         }
+        /// <summary>
+        /// 补打 
+        /// </summary>
+        /// <param name="md"></param>
+        /// <param name="tableName"></param>
+        /// <param name="oldOneBarCode"></param>
+        /// <param name="oldBarCode"></param>
+        /// <returns></returns>
+        public string ReprintSave(BarCodeModel md, string tableName,string oldOneBarCode,string oldBarCode)
+        {
+            LocalDBService local = new LocalDBService(SqlHelper.GetConnSting());
+            try
+            {
+                local.BeginTrans();
+                //tb_barCode 更新 isDel=1 
+                db.DelBarCode(local, oldOneBarCode, tableName,$",Des5='条码补打,新条码[{md.OneBarCode}]'");
+                //tb_barCode 插入 printType=2 补打
+                
+                db.AddInfoNew(local, md, tableName);
+                if(!string.IsNullOrEmpty(md.BoxNo))
+                {
+                    //根据箱码删除接口表tb_Injectionn_Interface中数据
+                    wmsDal.DeleteRecord(local, md.BoxNo, oldOneBarCode, oldBarCode);
+                   
+                }
+                else
+                {
+                    //根据旧条码删除接口tb_Injectionn_Interface中数据
+                    wmsDal.DeleteInterface(local, oldOneBarCode);
+                }
+                md.Remark = "补打,原塑件码:" + oldOneBarCode;
+                wmsDal.SaveInterface(local, md, "");
+
+                local.Commit();
+
+                return "";
+            }
+            catch (Exception ex)
+            {
+                if (local != null)
+                {
+                    local.Rollback();
+                }
+                LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+
+                return ex.Message;
+            }
+            finally
+            {
+                if (local != null)
+                {
+                    local.EndTrans();
+                }
+            }
+        }
+
         public DataTable SearchInfo(string stationNo)
         {
             try
@@ -124,6 +182,7 @@ namespace MESClassLibrary.BLL.BasicInfo
             }
         }
 
+
         public DataTable SearchInfoAll()
         {
             try

MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs

@@ -369,9 +369,9 @@ namespace MESClassLibrary.DAL.BasicInfo
              
                 string sql = "";
                 
-                sql = "INSERT INTO " + tableName + " (ID,StationID,OneBarCode,[BarCode],[StockNo],[PartNo],[PrintType],[CreateTime],[IsImport],StationID2,PlanID,ProductNature,Des1,Des2,Des3,Des4,Des5,BoxNo,Weight";
+                sql = "INSERT INTO " + tableName + " (ID,StationID,OneBarCode,[BarCode],[StockNo],[PartNo],[PrintType],[CreateTime],[IsImport],StationID2,PlanID,ProductNature,Des1,Des2,Des3,Des4,Des5,BoxNo,Weight,BatchNo";
-                sql += $") VALUES ('{md.ID}','{md.StationID}','{md.OneBarCode}','{md.BarCode}','{md.StockNo}','{md.PartNo}','{md.PrintType}',getdate(),'{md.Import}'," +
+            sql += $") VALUES ('{md.ID}','{md.StationID}','{md.OneBarCode}','{md.BarCode}','{md.StockNo}','{md.PartNo}','{md.PrintType}',getdate(),'{md.Import}'," +
-                $"'{md.StationID2}','{md.PlanID}','{md.ProductNature}','{md.Des1}','{md.Des2}','{md.Des3}','{md.Des4}','{md.Des5}','{md.BoxNo}','{ md.Weight}')";
+            $"'{md.StationID2}','{md.PlanID}','{md.ProductNature}','{md.Des1}','{md.Des2}','{md.Des3}','{md.Des4}','{md.Des5}','{md.BoxNo}','{ md.Weight}','{ md.BatchNo}')";
               
              
                 return  local.Exec_NonQuery(sql);
@@ -686,7 +686,7 @@ namespace MESClassLibrary.DAL.BasicInfo
         {
             try
             {
-                string sql = @"select top 1  * from " + tableName + " where BarCode=@BarCode order by [CreateTime] desc ";
+                string sql = @"select top 1  * from " + tableName + " where BarCode=@BarCode and IsBad=0 and IsDel=0 order by [CreateTime] desc ";
 
                 SqlParameter[] param = new SqlParameter[1];
                 param[0] = new SqlParameter("@BarCode", SqlDbType.VarChar);
@@ -798,14 +798,14 @@ namespace MESClassLibrary.DAL.BasicInfo
             }
         }
 
-        public bool DelBarCode(LocalDBService localDB, string  barCode, string tableName)
+        public bool DelBarCode(LocalDBService localDB, string  barCode, string tableName, string upField = null )
         {
             string column1 = "OneBarCode";
             if (barCode.Contains("."))
             {
                 column1 = "BarCode";
             }
-            string sql =  "update " + tableName + $"  set IsDel=1 where {column1}='{barCode}'";
+            string sql =  "update " + tableName + $"  set IsDel=1 {upField} where {column1}='{barCode}'";
 
             return localDB.Exec_NonQuery(sql);
 

MESClassLibrary/DAL/Wms/WmsDAL.cs

@@ -58,7 +58,7 @@ namespace MESClassLibrary.DAL.Injection
         {
 
             string sql = $" insert into  tb_Injectionn_Interface(PackageCode,OneBarCode,BarCode,Remark,QaRst,Describe,BadReason)" +
-                                   $" values ('{bcm.BoxNo}','{bcm.OneBarCode}','{bcm.BarCode}','','{bcm.IsBad}','{bcm.Des1}','{badReason}')";
+                                   $" values ('{bcm.BoxNo}','{bcm.OneBarCode}','{bcm.BarCode}','{bcm.Remark}','{bcm.IsBad}','{bcm.Des1}','{badReason}')";
             return local.Exec_NonQuery(sql);
 
         }

MESClassLibrary/Model/BarCodeModel.cs

@@ -46,5 +46,7 @@ namespace MESClassLibrary.Model
         public string Des5 { get; set; }
 
         public decimal Weight { get; set; }
+        public string BatchNo { get; set; }
+        public string Remark { get; set; }
     }
 }