From 65892a66fa446b57b804d8272c34608815dcb02f Mon Sep 17 00:00:00 2001
From: "ruoxing.wang" <88384874@qq.com>
Date: Fri, 29 Nov 2024 16:44:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=A1=91BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 InjectionPC/FrmMain2408.Designer.cs           |   6 -
 .../FrmBarCodeSearch2408.Designer.cs          | 237 +++++++++---------
 InjectionSearch/FrmBarCodeSearch2408.cs       | 196 +++++++--------
 MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs   |  16 +-
 MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs   |   2 +-
 MESClassLibrary/DAL/Wms/WmsDAL.cs             |  17 +-
 PaintingPC/FrmQuality.cs                      |   9 +-
 PaintingPC/Function.cs                        |   6 +-
 PaintingPC/Model/InspectModel.cs              |   4 +
 9 files changed, 259 insertions(+), 234 deletions(-)

diff --git a/InjectionPC/FrmMain2408.Designer.cs b/InjectionPC/FrmMain2408.Designer.cs
index 79798f1..96f4122 100644
--- a/InjectionPC/FrmMain2408.Designer.cs
+++ b/InjectionPC/FrmMain2408.Designer.cs
@@ -1040,9 +1040,6 @@
             this.comBoxSizeR.Enabled = false;
             this.comBoxSizeR.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.comBoxSizeR.FormattingEnabled = true;
-            this.comBoxSizeR.Items.AddRange(new object[] {
-            "A班",
-            "B班"});
             this.comBoxSizeR.Location = new System.Drawing.Point(0, 20);
             this.comBoxSizeR.Margin = new System.Windows.Forms.Padding(5);
             this.comBoxSizeR.Name = "comBoxSizeR";
@@ -1243,9 +1240,6 @@
             this.comBoxSizeL.Enabled = false;
             this.comBoxSizeL.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.comBoxSizeL.FormattingEnabled = true;
-            this.comBoxSizeL.Items.AddRange(new object[] {
-            "A班",
-            "B班"});
             this.comBoxSizeL.Location = new System.Drawing.Point(2, 10);
             this.comBoxSizeL.Margin = new System.Windows.Forms.Padding(5);
             this.comBoxSizeL.Name = "comBoxSizeL";
diff --git a/InjectionSearch/FrmBarCodeSearch2408.Designer.cs b/InjectionSearch/FrmBarCodeSearch2408.Designer.cs
index 71db6c9..b45b452 100644
--- a/InjectionSearch/FrmBarCodeSearch2408.Designer.cs
+++ b/InjectionSearch/FrmBarCodeSearch2408.Designer.cs
@@ -83,10 +83,10 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
-            this.label1.Location = new System.Drawing.Point(165, 103);
-            this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label1.Location = new System.Drawing.Point(180, 118);
+            this.label1.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(178, 51);
+            this.label1.Size = new System.Drawing.Size(202, 58);
             this.label1.TabIndex = 0;
             this.label1.Text = "产品:";
             // 
@@ -94,10 +94,10 @@
             // 
             this.comboBox1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
             this.comboBox1.FormattingEnabled = true;
-            this.comboBox1.Location = new System.Drawing.Point(407, 100);
-            this.comboBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.comboBox1.Location = new System.Drawing.Point(444, 114);
+            this.comboBox1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
             this.comboBox1.Name = "comboBox1";
-            this.comboBox1.Size = new System.Drawing.Size(1146, 59);
+            this.comboBox1.Size = new System.Drawing.Size(1250, 66);
             this.comboBox1.TabIndex = 1;
             this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
             // 
@@ -105,10 +105,10 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
-            this.label2.Location = new System.Drawing.Point(156, 191);
-            this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label2.Location = new System.Drawing.Point(170, 218);
+            this.label2.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(230, 51);
+            this.label2.Size = new System.Drawing.Size(261, 58);
             this.label2.TabIndex = 2;
             this.label2.Text = "零件号:";
             // 
@@ -116,30 +116,30 @@
             // 
             this.textBox1.Enabled = false;
             this.textBox1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
-            this.textBox1.Location = new System.Drawing.Point(407, 177);
-            this.textBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.textBox1.Location = new System.Drawing.Point(444, 202);
+            this.textBox1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
             this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(435, 65);
+            this.textBox1.Size = new System.Drawing.Size(474, 74);
             this.textBox1.TabIndex = 3;
             // 
             // textBox2
             // 
             this.textBox2.Enabled = false;
             this.textBox2.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
-            this.textBox2.Location = new System.Drawing.Point(407, 266);
-            this.textBox2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.textBox2.Location = new System.Drawing.Point(444, 304);
+            this.textBox2.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
             this.textBox2.Name = "textBox2";
-            this.textBox2.Size = new System.Drawing.Size(1146, 65);
+            this.textBox2.Size = new System.Drawing.Size(1250, 74);
             this.textBox2.TabIndex = 4;
             // 
             // label3
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
-            this.label3.Location = new System.Drawing.Point(165, 285);
-            this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label3.Location = new System.Drawing.Point(180, 326);
+            this.label3.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(178, 51);
+            this.label3.Size = new System.Drawing.Size(202, 58);
             this.label3.TabIndex = 5;
             this.label3.Text = "原料:";
             // 
@@ -160,10 +160,10 @@
             this.panel1.Controls.Add(this.textBox2);
             this.panel1.Controls.Add(this.label2);
             this.panel1.Controls.Add(this.textBox1);
-            this.panel1.Location = new System.Drawing.Point(339, 947);
-            this.panel1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.panel1.Location = new System.Drawing.Point(370, 1082);
+            this.panel1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1841, 555);
+            this.panel1.Size = new System.Drawing.Size(2008, 634);
             this.panel1.TabIndex = 6;
             // 
             // cboxHandBox
@@ -172,10 +172,10 @@
             this.cboxHandBox.Checked = true;
             this.cboxHandBox.CheckState = System.Windows.Forms.CheckState.Checked;
             this.cboxHandBox.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
-            this.cboxHandBox.Location = new System.Drawing.Point(1278, 28);
-            this.cboxHandBox.Margin = new System.Windows.Forms.Padding(4);
+            this.cboxHandBox.Location = new System.Drawing.Point(1394, 32);
+            this.cboxHandBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.cboxHandBox.Name = "cboxHandBox";
-            this.cboxHandBox.Size = new System.Drawing.Size(256, 55);
+            this.cboxHandBox.Size = new System.Drawing.Size(293, 62);
             this.cboxHandBox.TabIndex = 15;
             this.cboxHandBox.Tag = "true";
             this.cboxHandBox.Text = "打印箱码";
@@ -185,20 +185,20 @@
             // 
             this.comboBox2.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
             this.comboBox2.FormattingEnabled = true;
-            this.comboBox2.Location = new System.Drawing.Point(407, 14);
-            this.comboBox2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.comboBox2.Location = new System.Drawing.Point(444, 16);
+            this.comboBox2.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
             this.comboBox2.Name = "comboBox2";
-            this.comboBox2.Size = new System.Drawing.Size(374, 59);
+            this.comboBox2.Size = new System.Drawing.Size(408, 66);
             this.comboBox2.TabIndex = 12;
             // 
             // label7
             // 
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
-            this.label7.Location = new System.Drawing.Point(165, 28);
-            this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label7.Location = new System.Drawing.Point(180, 32);
+            this.label7.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(178, 51);
+            this.label7.Size = new System.Drawing.Size(202, 58);
             this.label7.TabIndex = 11;
             this.label7.Text = "机台:";
             // 
@@ -206,10 +206,10 @@
             // 
             this.label16.AutoSize = true;
             this.label16.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label16.Location = new System.Drawing.Point(898, 368);
-            this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label16.Location = new System.Drawing.Point(980, 421);
+            this.label16.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
             this.label16.Name = "label16";
-            this.label16.Size = new System.Drawing.Size(238, 51);
+            this.label16.Size = new System.Drawing.Size(265, 58);
             this.label16.TabIndex = 10;
             this.label16.Text = "(yyMMdd)";
             // 
@@ -217,20 +217,20 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
-            this.label5.Location = new System.Drawing.Point(158, 453);
-            this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label5.Location = new System.Drawing.Point(172, 518);
+            this.label5.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(178, 51);
+            this.label5.Size = new System.Drawing.Size(202, 58);
             this.label5.TabIndex = 8;
             this.label5.Text = "数量:";
             // 
             // textBox4
             // 
             this.textBox4.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
-            this.textBox4.Location = new System.Drawing.Point(407, 453);
-            this.textBox4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.textBox4.Location = new System.Drawing.Point(444, 518);
+            this.textBox4.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
             this.textBox4.Name = "textBox4";
-            this.textBox4.Size = new System.Drawing.Size(435, 65);
+            this.textBox4.Size = new System.Drawing.Size(474, 74);
             this.textBox4.TabIndex = 9;
             this.textBox4.Text = "10";
             // 
@@ -238,20 +238,20 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
-            this.label4.Location = new System.Drawing.Point(147, 383);
-            this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label4.Location = new System.Drawing.Point(160, 438);
+            this.label4.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(230, 51);
+            this.label4.Size = new System.Drawing.Size(261, 58);
             this.label4.TabIndex = 6;
             this.label4.Text = "批次号:";
             // 
             // textBox3
             // 
             this.textBox3.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
-            this.textBox3.Location = new System.Drawing.Point(407, 362);
-            this.textBox3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.textBox3.Location = new System.Drawing.Point(444, 414);
+            this.textBox3.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
             this.textBox3.Name = "textBox3";
-            this.textBox3.Size = new System.Drawing.Size(435, 65);
+            this.textBox3.Size = new System.Drawing.Size(474, 74);
             this.textBox3.TabIndex = 7;
             // 
             // label19
@@ -259,10 +259,10 @@
             this.label19.BackColor = System.Drawing.Color.DeepSkyBlue;
             this.label19.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.label19.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label19.Location = new System.Drawing.Point(2174, 947);
-            this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label19.Location = new System.Drawing.Point(2372, 1082);
+            this.label19.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
             this.label19.Name = "label19";
-            this.label19.Size = new System.Drawing.Size(132, 553);
+            this.label19.Size = new System.Drawing.Size(144, 632);
             this.label19.TabIndex = 17;
             this.label19.Text = "打印条码";
             this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -273,10 +273,10 @@
             this.label11.BackColor = System.Drawing.Color.DeepSkyBlue;
             this.label11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.label11.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label11.Location = new System.Drawing.Point(4, 947);
-            this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label11.Location = new System.Drawing.Point(4, 1082);
+            this.label11.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
             this.label11.Name = "label11";
-            this.label11.Size = new System.Drawing.Size(332, 553);
+            this.label11.Size = new System.Drawing.Size(362, 632);
             this.label11.TabIndex = 18;
             this.label11.Text = "打印信息:";
             this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -287,10 +287,10 @@
             this.label10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.label10.Dock = System.Windows.Forms.DockStyle.Fill;
             this.label10.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label10.Location = new System.Drawing.Point(6, 0);
-            this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label10.Location = new System.Drawing.Point(7, 0);
+            this.label10.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
             this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(379, 522);
+            this.label10.Size = new System.Drawing.Size(413, 596);
             this.label10.TabIndex = 19;
             this.label10.Text = "打印记录:";
             this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -304,19 +304,19 @@
             this.panel3.Controls.Add(this.button1);
             this.panel3.Controls.Add(this.label6);
             this.panel3.Controls.Add(this.textBox5);
-            this.panel3.Location = new System.Drawing.Point(4, 4);
-            this.panel3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.panel3.Location = new System.Drawing.Point(4, 5);
+            this.panel3.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
             this.panel3.Name = "panel3";
-            this.panel3.Size = new System.Drawing.Size(2290, 105);
+            this.panel3.Size = new System.Drawing.Size(2498, 120);
             this.panel3.TabIndex = 22;
             // 
             // btnBoxRePrint
             // 
             this.btnBoxRePrint.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
-            this.btnBoxRePrint.Location = new System.Drawing.Point(304, 5);
-            this.btnBoxRePrint.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.btnBoxRePrint.Location = new System.Drawing.Point(332, 6);
+            this.btnBoxRePrint.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
             this.btnBoxRePrint.Name = "btnBoxRePrint";
-            this.btnBoxRePrint.Size = new System.Drawing.Size(284, 88);
+            this.btnBoxRePrint.Size = new System.Drawing.Size(310, 101);
             this.btnBoxRePrint.TabIndex = 8;
             this.btnBoxRePrint.Text = "箱码补打";
             this.btnBoxRePrint.UseVisualStyleBackColor = true;
@@ -325,10 +325,10 @@
             // btnPackage
             // 
             this.btnPackage.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
-            this.btnPackage.Location = new System.Drawing.Point(9, 5);
-            this.btnPackage.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.btnPackage.Location = new System.Drawing.Point(10, 6);
+            this.btnPackage.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
             this.btnPackage.Name = "btnPackage";
-            this.btnPackage.Size = new System.Drawing.Size(284, 88);
+            this.btnPackage.Size = new System.Drawing.Size(310, 101);
             this.btnPackage.TabIndex = 7;
             this.btnPackage.Text = "不良替换";
             this.btnPackage.UseVisualStyleBackColor = true;
@@ -337,10 +337,10 @@
             // button1
             // 
             this.button1.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
-            this.button1.Location = new System.Drawing.Point(1969, 18);
-            this.button1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.button1.Location = new System.Drawing.Point(2148, 21);
+            this.button1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
             this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(174, 75);
+            this.button1.Size = new System.Drawing.Size(190, 86);
             this.button1.TabIndex = 6;
             this.button1.Text = "查询";
             this.button1.UseVisualStyleBackColor = true;
@@ -350,20 +350,20 @@
             // 
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
-            this.label6.Location = new System.Drawing.Point(875, 21);
-            this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label6.Location = new System.Drawing.Point(955, 24);
+            this.label6.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(230, 51);
+            this.label6.Size = new System.Drawing.Size(261, 58);
             this.label6.TabIndex = 4;
             this.label6.Text = "条码号:";
             // 
             // textBox5
             // 
             this.textBox5.Font = new System.Drawing.Font("宋体", 21.75F, System.Drawing.FontStyle.Bold);
-            this.textBox5.Location = new System.Drawing.Point(1148, 16);
-            this.textBox5.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.textBox5.Location = new System.Drawing.Point(1252, 18);
+            this.textBox5.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
             this.textBox5.Name = "textBox5";
-            this.textBox5.Size = new System.Drawing.Size(758, 65);
+            this.textBox5.Size = new System.Drawing.Size(827, 74);
             this.textBox5.TabIndex = 5;
             // 
             // glacialList1
@@ -428,17 +428,17 @@
             this.glacialList1.HoverEvents = false;
             this.glacialList1.HoverTime = 1;
             this.glacialList1.ImageList = null;
-            this.glacialList1.ItemHeight = 35;
+            this.glacialList1.ItemHeight = 39;
             this.glacialList1.ItemWordWrap = false;
-            this.glacialList1.Location = new System.Drawing.Point(404, 114);
-            this.glacialList1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.glacialList1.Location = new System.Drawing.Point(441, 130);
+            this.glacialList1.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
             this.glacialList1.Name = "glacialList1";
             this.glacialList1.Selectable = true;
             this.glacialList1.SelectedTextColor = System.Drawing.Color.White;
             this.glacialList1.SelectionColor = System.Drawing.Color.Lime;
             this.glacialList1.ShowBorder = true;
             this.glacialList1.ShowFocusRect = false;
-            this.glacialList1.Size = new System.Drawing.Size(1904, 828);
+            this.glacialList1.Size = new System.Drawing.Size(2077, 946);
             this.glacialList1.SortType = GlacialComponents.Controls.SortTypes.InsertionSort;
             this.glacialList1.SuperFlatHeaderColor = System.Drawing.Color.White;
             this.glacialList1.TabIndex = 23;
@@ -450,13 +450,13 @@
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
             this.tableLayoutPanel1.Controls.Add(this.groupBox2, 0, 1);
             this.tableLayoutPanel1.Controls.Add(this.label10, 0, 0);
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(4, 117);
-            this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4);
+            this.tableLayoutPanel1.Location = new System.Drawing.Point(4, 134);
+            this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";
             this.tableLayoutPanel1.RowCount = 2;
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 63.3705F));
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 36.6295F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(391, 824);
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(427, 942);
             this.tableLayoutPanel1.TabIndex = 24;
             // 
             // groupBox2
@@ -465,11 +465,11 @@
             this.groupBox2.Controls.Add(this.tableLayoutPanel4);
             this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.groupBox2.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Bold);
-            this.groupBox2.Location = new System.Drawing.Point(4, 526);
-            this.groupBox2.Margin = new System.Windows.Forms.Padding(4);
+            this.groupBox2.Location = new System.Drawing.Point(4, 601);
+            this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Padding = new System.Windows.Forms.Padding(4);
-            this.groupBox2.Size = new System.Drawing.Size(383, 294);
+            this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+            this.groupBox2.Size = new System.Drawing.Size(419, 336);
             this.groupBox2.TabIndex = 20;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "装箱信息";
@@ -483,14 +483,14 @@
             this.tableLayoutPanel4.Controls.Add(this.lbPackageCodeL, 0, 0);
             this.tableLayoutPanel4.Controls.Add(this.panel2, 1, 1);
             this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 32);
-            this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4);
+            this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 37);
+            this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.tableLayoutPanel4.Name = "tableLayoutPanel4";
             this.tableLayoutPanel4.RowCount = 3;
             this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 49.99751F));
             this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.00249F));
-            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35F));
-            this.tableLayoutPanel4.Size = new System.Drawing.Size(375, 258);
+            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 40F));
+            this.tableLayoutPanel4.Size = new System.Drawing.Size(411, 294);
             this.tableLayoutPanel4.TabIndex = 3;
             // 
             // label38
@@ -498,10 +498,10 @@
             this.label38.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.label38.BackColor = System.Drawing.Color.Transparent;
             this.label38.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label38.Location = new System.Drawing.Point(6, 143);
-            this.label38.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label38.Location = new System.Drawing.Point(7, 162);
+            this.label38.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
             this.label38.Name = "label38";
-            this.label38.Size = new System.Drawing.Size(106, 47);
+            this.label38.Size = new System.Drawing.Size(116, 54);
             this.label38.TabIndex = 1;
             this.label38.Text = "规格:";
             this.label38.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -512,10 +512,10 @@
             this.lbPackageCodeL.AutoSize = true;
             this.tableLayoutPanel4.SetColumnSpan(this.lbPackageCodeL, 2);
             this.lbPackageCodeL.Font = new System.Drawing.Font("宋体", 13.875F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lbPackageCodeL.Location = new System.Drawing.Point(4, 39);
+            this.lbPackageCodeL.Location = new System.Drawing.Point(4, 44);
             this.lbPackageCodeL.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lbPackageCodeL.Name = "lbPackageCodeL";
-            this.lbPackageCodeL.Size = new System.Drawing.Size(0, 33);
+            this.lbPackageCodeL.Size = new System.Drawing.Size(0, 37);
             this.lbPackageCodeL.TabIndex = 5;
             // 
             // panel2
@@ -523,9 +523,9 @@
             this.panel2.Controls.Add(this.btnChangeSizeR);
             this.panel2.Controls.Add(this.comBoxSizeL);
             this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panel2.Location = new System.Drawing.Point(128, 114);
+            this.panel2.Location = new System.Drawing.Point(140, 129);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(244, 105);
+            this.panel2.Size = new System.Drawing.Size(268, 121);
             this.panel2.TabIndex = 6;
             // 
             // btnChangeSizeR
@@ -533,10 +533,10 @@
             this.btnChangeSizeR.BackColor = System.Drawing.Color.DeepSkyBlue;
             this.btnChangeSizeR.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnChangeSizeR.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnChangeSizeR.Location = new System.Drawing.Point(130, 30);
-            this.btnChangeSizeR.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnChangeSizeR.Location = new System.Drawing.Point(142, 34);
+            this.btnChangeSizeR.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
             this.btnChangeSizeR.Name = "btnChangeSizeR";
-            this.btnChangeSizeR.Size = new System.Drawing.Size(113, 64);
+            this.btnChangeSizeR.Size = new System.Drawing.Size(123, 73);
             this.btnChangeSizeR.TabIndex = 5;
             this.btnChangeSizeR.Text = "调整";
             this.btnChangeSizeR.UseVisualStyleBackColor = false;
@@ -549,13 +549,10 @@
             this.comBoxSizeL.Enabled = false;
             this.comBoxSizeL.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.comBoxSizeL.FormattingEnabled = true;
-            this.comBoxSizeL.Items.AddRange(new object[] {
-            "A班",
-            "B班"});
-            this.comBoxSizeL.Location = new System.Drawing.Point(0, 29);
-            this.comBoxSizeL.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.comBoxSizeL.Location = new System.Drawing.Point(0, 33);
+            this.comBoxSizeL.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
             this.comBoxSizeL.Name = "comBoxSizeL";
-            this.comBoxSizeL.Size = new System.Drawing.Size(128, 64);
+            this.comBoxSizeL.Size = new System.Drawing.Size(139, 72);
             this.comBoxSizeL.TabIndex = 3;
             this.comBoxSizeL.SelectedValueChanged += new System.EventHandler(this.comBoxSizeL_SelectedValueChanged);
             // 
@@ -566,20 +563,20 @@
             this.pnBoxReprint.Controls.Add(this.btnRePrint);
             this.pnBoxReprint.Controls.Add(this.txtRePrintBoxCode);
             this.pnBoxReprint.Controls.Add(this.label24);
-            this.pnBoxReprint.Location = new System.Drawing.Point(513, 373);
-            this.pnBoxReprint.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.pnBoxReprint.Location = new System.Drawing.Point(560, 426);
+            this.pnBoxReprint.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.pnBoxReprint.Name = "pnBoxReprint";
-            this.pnBoxReprint.Size = new System.Drawing.Size(1281, 132);
+            this.pnBoxReprint.Size = new System.Drawing.Size(1397, 151);
             this.pnBoxReprint.TabIndex = 25;
             this.pnBoxReprint.Visible = false;
             // 
             // btnPrintCancel
             // 
             this.btnPrintCancel.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnPrintCancel.Location = new System.Drawing.Point(1097, 38);
-            this.btnPrintCancel.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.btnPrintCancel.Location = new System.Drawing.Point(1197, 43);
+            this.btnPrintCancel.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.btnPrintCancel.Name = "btnPrintCancel";
-            this.btnPrintCancel.Size = new System.Drawing.Size(147, 52);
+            this.btnPrintCancel.Size = new System.Drawing.Size(160, 59);
             this.btnPrintCancel.TabIndex = 3;
             this.btnPrintCancel.Text = "取消";
             this.btnPrintCancel.UseVisualStyleBackColor = true;
@@ -588,10 +585,10 @@
             // btnRePrint
             // 
             this.btnRePrint.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnRePrint.Location = new System.Drawing.Point(941, 35);
-            this.btnRePrint.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.btnRePrint.Location = new System.Drawing.Point(1027, 40);
+            this.btnRePrint.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.btnRePrint.Name = "btnRePrint";
-            this.btnRePrint.Size = new System.Drawing.Size(147, 52);
+            this.btnRePrint.Size = new System.Drawing.Size(160, 59);
             this.btnRePrint.TabIndex = 2;
             this.btnRePrint.Text = "确定";
             this.btnRePrint.UseVisualStyleBackColor = true;
@@ -600,29 +597,29 @@
             // txtRePrintBoxCode
             // 
             this.txtRePrintBoxCode.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtRePrintBoxCode.Location = new System.Drawing.Point(191, 38);
-            this.txtRePrintBoxCode.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
+            this.txtRePrintBoxCode.Location = new System.Drawing.Point(208, 43);
+            this.txtRePrintBoxCode.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.txtRePrintBoxCode.Name = "txtRePrintBoxCode";
-            this.txtRePrintBoxCode.Size = new System.Drawing.Size(676, 49);
+            this.txtRePrintBoxCode.Size = new System.Drawing.Size(737, 55);
             this.txtRePrintBoxCode.TabIndex = 1;
             // 
             // label24
             // 
             this.label24.AutoSize = true;
             this.label24.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label24.Location = new System.Drawing.Point(25, 46);
+            this.label24.Location = new System.Drawing.Point(27, 53);
             this.label24.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
             this.label24.Name = "label24";
-            this.label24.Size = new System.Drawing.Size(169, 37);
+            this.label24.Size = new System.Drawing.Size(190, 42);
             this.label24.TabIndex = 0;
             this.label24.Text = "箱单号:";
             this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // FrmBarCodeSearch2408
             // 
-            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(2317, 1433);
+            this.ClientSize = new System.Drawing.Size(2528, 1638);
             this.Controls.Add(this.pnBoxReprint);
             this.Controls.Add(this.tableLayoutPanel1);
             this.Controls.Add(this.glacialList1);
@@ -630,7 +627,7 @@
             this.Controls.Add(this.label11);
             this.Controls.Add(this.label19);
             this.Controls.Add(this.panel1);
-            this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.Margin = new System.Windows.Forms.Padding(7, 6, 7, 6);
             this.Name = "FrmBarCodeSearch2408";
             this.Text = "条码信息";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmBarCodeSearch_FormClosing);
diff --git a/InjectionSearch/FrmBarCodeSearch2408.cs b/InjectionSearch/FrmBarCodeSearch2408.cs
index fe98686..42b0202 100644
--- a/InjectionSearch/FrmBarCodeSearch2408.cs
+++ b/InjectionSearch/FrmBarCodeSearch2408.cs
@@ -177,101 +177,101 @@ namespace InjectionSearch
             }
         }
 
-        private void label18_Click(object sender, EventArgs e)
-        {
-            string code = "",name="";
-            BarCodeModel md = new BarCodeModel();
-            BarCodeBLL bll = new BarCodeBLL();
-            ProductBLL pbll=new ProductBLL();
-            string filename = "", partNo = "", OneCode="";
-
-            try
-            {
-                if (glacialList1.SelectedItems.Count == 0)
-                {
-                    MessageBox.Show("请选择要补打的条码!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                    return;
-                }
-                else
-                {
-                    GlacialComponents.Controls.GLItem gv;
-                    gv = glacialList1.SelectedItems[0] as GlacialComponents.Controls.GLItem;
-                    code = gv.Text;
-
-                    string[] aa = code.Split('.');
-                    partNo = aa[0];
-
-                    DataTable dt = bll.SearchInfoByBarCode(code);
-                    if (dt != null && dt.Rows.Count > 0)
-                    {
-                        name = dt.Rows[0]["ProductName"].ToString();
-                        md.ID = Guid.NewGuid().ToString();
-                        md.BarCode = code;
-                        md.StationID = Program.StationID;
-                        md.StockNo = dt.Rows[0]["StockNo"].ToString();
-                        md.OneBarCode = dt.Rows[0]["OneBarCode"].ToString();
-                        md.StationID2 = dt.Rows[0]["StationID"].ToString();
-                        md.PrintType = 2;
-
-                        DataTable pdt = pbll.SearchIsImportByStockNo(md.StockNo);
-                        if (pdt != null && pdt.Rows.Count > 0)
-                        {
-                            if (pdt.Rows[0]["isImport"].ToString() == "1")
-                            {
-                                md.Import = "国产料Kingfa";
-                            }
-                            else
-                            {
-                                md.Import = "";
-                            }
-                        }
-                    }
-
-                    //if (bll.Add_Info_New(md, "tb_BarCode5") == false)
-                    //{
-                    //    return;
-                    //}
-                    if (SaveBarCode(md, "tb_BarCode5", false) == false)
-                    {
-                        return;
-                    }
-                    #region 打印条码
-                    PlasticBLL plbll = new PlasticBLL();
-
-                    //filename = System.AppDomain.CurrentDomain.BaseDirectory + "单个条码.grf";
-                    filename = System.AppDomain.CurrentDomain.BaseDirectory + PrintMoudleName();
-                    DataTable headTable = new DataTable();
-                    headTable.Columns.Add("PrintTime");
-                    headTable.Columns.Add("PartNo");
-                    headTable.Columns.Add("PartName");
-                    headTable.Columns.Add("OneBarCode");
-                    headTable.Columns.Add("BarCode");
-                    DataRow row = headTable.NewRow();
-                    row["PrintTime"] = GetDateTime().ToString("yyyy/MM/dd HH:mm:ss");
-                    row["PartNo"] = partNo;
-                    row["PartName"] = name;
-                    row["OneBarCode"] = md.OneBarCode;
-                    row["BarCode"] = code;
-
-
-                    string reportName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                    headTable.Rows.Add(row);
-
-                    ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName);
-
-                    rp.Report.Print(false);
-
-                    #endregion
-
-                    initBarCode();
-                }
-            }
-            catch (Exception ex)
-            {
-                LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
-            }
+        //private void label18_Click(object sender, EventArgs e)
+        //{
+        //    string code = "",name="";
+        //    BarCodeModel md = new BarCodeModel();
+        //    BarCodeBLL bll = new BarCodeBLL();
+        //    ProductBLL pbll=new ProductBLL();
+        //    string filename = "", partNo = "", OneCode="";
+
+        //    try
+        //    {
+        //        if (glacialList1.SelectedItems.Count == 0)
+        //        {
+        //            MessageBox.Show("请选择要补打的条码!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+        //            return;
+        //        }
+        //        else
+        //        {
+        //            GlacialComponents.Controls.GLItem gv;
+        //            gv = glacialList1.SelectedItems[0] as GlacialComponents.Controls.GLItem;
+        //            code = gv.Text;
+
+        //            string[] aa = code.Split('.');
+        //            partNo = aa[0];
+
+        //            DataTable dt = bll.SearchInfoByBarCode(code);
+        //            if (dt != null && dt.Rows.Count > 0)
+        //            {
+        //                name = dt.Rows[0]["ProductName"].ToString();
+        //                md.ID = Guid.NewGuid().ToString();
+        //                md.BarCode = code;
+        //                md.StationID = Program.StationID;
+        //                md.StockNo = dt.Rows[0]["StockNo"].ToString();
+        //                md.OneBarCode = dt.Rows[0]["OneBarCode"].ToString();
+        //                md.StationID2 = dt.Rows[0]["StationID"].ToString();
+        //                md.PrintType = 2;
+
+        //                DataTable pdt = pbll.SearchIsImportByStockNo(md.StockNo);
+        //                if (pdt != null && pdt.Rows.Count > 0)
+        //                {
+        //                    if (pdt.Rows[0]["isImport"].ToString() == "1")
+        //                    {
+        //                        md.Import = "国产料Kingfa";
+        //                    }
+        //                    else
+        //                    {
+        //                        md.Import = "";
+        //                    }
+        //                }
+        //            }
+
+        //            //if (bll.Add_Info_New(md, "tb_BarCode5") == false)
+        //            //{
+        //            //    return;
+        //            //}
+        //            if (SaveBarCode(md, "tb_BarCode5", false) == false)
+        //            {
+        //                return;
+        //            }
+        //            #region 打印条码
+        //            PlasticBLL plbll = new PlasticBLL();
+
+        //            //filename = System.AppDomain.CurrentDomain.BaseDirectory + "单个条码.grf";
+        //            filename = System.AppDomain.CurrentDomain.BaseDirectory + PrintMoudleName();
+        //            DataTable headTable = new DataTable();
+        //            headTable.Columns.Add("PrintTime");
+        //            headTable.Columns.Add("PartNo");
+        //            headTable.Columns.Add("PartName");
+        //            headTable.Columns.Add("OneBarCode");
+        //            headTable.Columns.Add("BarCode");
+        //            DataRow row = headTable.NewRow();
+        //            row["PrintTime"] = GetDateTime().ToString("yyyy/MM/dd HH:mm:ss");
+        //            row["PartNo"] = partNo;
+        //            row["PartName"] = name;
+        //            row["OneBarCode"] = md.OneBarCode;
+        //            row["BarCode"] = code;
+
+
+        //            string reportName = ConfigurationManager.AppSettings["Printer1"].ToString();
+        //            headTable.Rows.Add(row);
+
+        //            ReportHelper rp = new ReportHelper(filename, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, reportName);
+
+        //            rp.Report.Print(false);
+
+        //            #endregion
+
+        //            initBarCode();
+        //        }
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+        //    }
             
-        }
+        //}
 
         public DateTime GetDateTime()
         {
@@ -476,7 +476,7 @@ namespace InjectionSearch
                             string[] part = newcode.Split('.');
                             //存入tb_BarCode表
                             md.ID = Guid.NewGuid().ToString();
-                            md.StationID = Program.StationID;
+                            md.StationID = comboBox2.Text.Trim();
                             md.StationID2 = stationID;
                             md.StockNo = stockNo;
                             md.OneBarCode = NewOneCode;
@@ -784,7 +784,7 @@ namespace InjectionSearch
                             #region 存入tb_BarCode表
 
                             md.ID = Guid.NewGuid().ToString();
-                            md.StationID = Program.StationID;
+                            md.StationID = comboBox2.Text.Trim();
                             md.StationID2 = stationID;
                             md.StockNo = stockNo;
                             md.OneBarCode = NewOneCode;
@@ -1027,7 +1027,7 @@ namespace InjectionSearch
             boxmd.BoxCount = 0;
             boxmd.BoxType = 0;
             boxmd.IsFlag = 0;
-            boxmd.StationNo = Program.station;
+            boxmd.StationNo = comboBox2.Text?.Trim();//Program.station;
             if (pdt != null && pdt.Rows.Count > 0)
             {
                 boxmd.PartName = pdt.Rows[0]["ProductName"].ToString();
@@ -1081,7 +1081,7 @@ namespace InjectionSearch
                                 ////wms接口传递
                                 //_wmsBll.SaveInterface(dt.Rows[0], MESClassLibrary.Enum.WmsInterfaceEnum.塑件箱码报工);
 
-                                _wmsBll.SaveInterface(dt.Rows[0]["BoxNo"].ToString(), _lastBoxNo, "", MESClassLibrary.Enum.WmsInterfaceEnum.塑件箱码报工, Program.station);
+                                _wmsBll.SaveInterface(dt.Rows[0]["BoxNo"].ToString(), _lastBoxNo, "", MESClassLibrary.Enum.WmsInterfaceEnum.塑件箱码报工, comboBox2.Text.Trim());
 
                                 //打印箱码
                                 PrintBoxCode(dt.Rows[0], realCount,false);
diff --git a/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs b/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs
index 797bacd..8744ccc 100644
--- a/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs
+++ b/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs
@@ -145,7 +145,21 @@ namespace MESClassLibrary.BLL.BasicInfo
                     wmsDal.DeleteInterface(local, oldOneBarCode);
                 }
                 md.Remark = "补打,原塑件码:" + oldOneBarCode;
-                wmsDal.SaveInterface(local, md, "", station);
+
+                //不绑箱码时,补打时向接口表插入
+                if (string.IsNullOrEmpty(md.BoxNo))
+                {
+                    wmsDal.SaveInterface(local, md, "", station);
+                }
+                else
+                {
+                    //整箱向wms报工了,才插入. 当前正在生产,并未整箱报工的,不向wms报工. 否则整箱报工时会冲突.
+                    if (wmsDal.IsSendPackageCode(md.BoxNo) == true)
+                    {
+                        wmsDal.SaveInterface(local, md, "", station);
+                    }
+                }
+               
 
                 local.Commit();
 
diff --git a/MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs b/MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs
index 4c37ef9..2e2cf6e 100644
--- a/MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs
+++ b/MESClassLibrary/DAL/BasicInfo/BarCodeDAl.cs
@@ -1160,7 +1160,7 @@ namespace MESClassLibrary.DAL.BasicInfo
         {
             try
             {
-                string sql = @"select top " + row + " * from " + tableName + $" where {whereStr} and  IsDel=0 and IsBad=0 order by CreateTime desc";
+                string sql = @"select top " + row + " * from " + tableName + $" where {whereStr} and  IsDel=0 and IsBad=0 and IsNull(BoxNo,'')!='' order by CreateTime desc";
 
                 SqlParameter[] param = new SqlParameter[0];
                // param[0] = new SqlParameter("@BoxNo", SqlDbType.VarChar);
diff --git a/MESClassLibrary/DAL/Wms/WmsDAL.cs b/MESClassLibrary/DAL/Wms/WmsDAL.cs
index e591e22..52df403 100644
--- a/MESClassLibrary/DAL/Wms/WmsDAL.cs
+++ b/MESClassLibrary/DAL/Wms/WmsDAL.cs
@@ -30,9 +30,20 @@ namespace MESClassLibrary.DAL.Injection
                 local.BeginTrans();
                 foreach (DataRow dr in barCodeTable.Rows)
                 {
-                    string sql = $" insert into  tb_Injectionn_Interface(PackageCode,OneBarCode,BarCode,Remark,QaRst,Describe,BadReason,Station)" +
-                        $" values ('{dr["BoxNo"]}','{dr["OneBarCode"]}','{dr["BarCode"]}','','0','{dr["PartName"]}','{badReason}','{station}')";
-                    local.Exec_NonQuery(sql);
+                    try
+                    {
+                        string sql = $" insert into  tb_Injectionn_Interface(PackageCode,OneBarCode,BarCode,Remark,QaRst,Describe,BadReason,Station)" +
+                      $" values ('{dr["BoxNo"]}','{dr["OneBarCode"]}','{dr["BarCode"]}','','0','{dr["PartName"]}','{badReason}','{station}')";
+                        local.Exec_NonQuery(sql);
+                    }
+                    catch(Exception ex)
+                    {
+                        if (ex.Message.Contains("重复键"))
+                        {
+                            continue;
+                        }
+                    }
+                  
                 }
                 local.Commit();
             }
diff --git a/PaintingPC/FrmQuality.cs b/PaintingPC/FrmQuality.cs
index c94f5b8..2eaaac3 100644
--- a/PaintingPC/FrmQuality.cs
+++ b/PaintingPC/FrmQuality.cs
@@ -461,7 +461,7 @@ namespace PaintingPC
                     ClearControlColor(SetControlGroup());
                     btnAbt.BackColor = Color.Red;
 
-                    SaveRst("报废", colorName, partName,0);
+                    SaveRst("报废", colorName, partName,0, userName);
                    
                 }
             });
@@ -474,11 +474,11 @@ namespace PaintingPC
         /// <param name="colorName"></param>
         /// <param name="partName"></param>
         /// <param name="isOK">0-不合格;1-合格;9-返喷  8-其他 </param>
-        void SaveRst(string state, string colorName, string partName,int isOK)
+        void SaveRst(string state, string colorName, string partName,int isOK,string userName="")
         {
 
             //保存
-            string id = SaveInspect(state, colorName, partName);
+            string id = SaveInspect(state, colorName, partName, userName);
 
             try
             {
@@ -638,7 +638,7 @@ namespace PaintingPC
         /// <param name="colorName"></param>
         /// <param name="partName"></param>
         /// <returns> 返回插入记录的ID</returns>
-        public string SaveInspect(string inspectResult,string colorName, string partName)
+        public string SaveInspect(string inspectResult,string colorName, string partName,string userName)
         {
             try
             {
@@ -703,6 +703,7 @@ namespace PaintingPC
                     {
                         model1.remark3 = "油漆件库"; // 喷涂质检 或 油漆件库
                     }
+                    model1.AddMan = userName;
                     return Function.InsertInspect2(model1);
                 }
                 return "";
diff --git a/PaintingPC/Function.cs b/PaintingPC/Function.cs
index 1395aab..2a7b0f7 100644
--- a/PaintingPC/Function.cs
+++ b/PaintingPC/Function.cs
@@ -1770,7 +1770,9 @@ namespace PaintingPC
                                                    ,[InspectTimes]
                                                    ,[remark1]
                                                    ,[remark2]
-                                                   ,[remark3]
+                                                   ,[remark3] 
+                                                   ,[CarType]
+                                                   ,[AddMan]
                                                    )
                                              VALUES
                                                    ('" + model.barcode + @"'
@@ -1788,6 +1790,8 @@ namespace PaintingPC
                                                    ,'" + model.remark1 + @"'
                                                    ,'" + model.remark2 + @"'
                                                    ,'" + model.remark3 + @"'
+                                                   ,'" + model.CarType + @"'
+                                                   ,'" + model.AddMan + @"'
                                                   );select @@Identity  ";
                 //res = SqlHelper.ExecuteNonQuery(SqlHelper.SqlConnString, CommandType.Text, sql, null);
                 DataTable dt= SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null);
diff --git a/PaintingPC/Model/InspectModel.cs b/PaintingPC/Model/InspectModel.cs
index 73588f8..b0daea1 100644
--- a/PaintingPC/Model/InspectModel.cs
+++ b/PaintingPC/Model/InspectModel.cs
@@ -74,5 +74,9 @@ namespace PaintingPC.Model
         /// 车型
         /// </summary>
         public string CarType { get; set; }
+        /// <summary>
+        /// 报废操作人
+        /// </summary>
+        public string AddMan { get; set; }
     }
 }