diff --git a/AddMaterial/App_Code/Function.cs b/AddMaterial/App_Code/Function.cs
index bba0ab1..23fc0d7 100644
--- a/AddMaterial/App_Code/Function.cs
+++ b/AddMaterial/App_Code/Function.cs
@@ -87,7 +87,11 @@ public class Function
             return list;
         }
     }
-
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="drumBarCode">桶号</param>
+    /// <returns></returns>
     public static string GetLastMaterialCode(string drumBarCode)
     {
         try
@@ -105,8 +109,24 @@ public class Function
             }
             else
             {
-                return DateTime.Now.ToString();  
+                return DateTime.Now.ToString();
             }
+
+            //string sql = @"select top 2 * from tb_InjectPlanReport where Drum='" + drumBarCode + "' order by time1 desc";
+
+            //DataTable res = SqlHelper.GetDataDateTable(SqlHelper.SqlConnString, CommandType.Text, sql, null);
+            //if (res.Rows.Count == 2)
+            //{
+            //    string stockNo = "";
+            //    string batchNo = "";
+            //    string partNo = "";
+            //    GetCode(res.Rows[1]["BarCode"].ToString(), out stockNo, out batchNo, out partNo);
+            //    return partNo;
+            //}
+            //else
+            //{
+            //    return DateTime.Now.ToString();
+            //}
         }
         catch
         {
diff --git a/AddMaterial/Handler.ashx b/AddMaterial/Handler.ashx
index 16cc371..0c6fe91 100644
--- a/AddMaterial/Handler.ashx
+++ b/AddMaterial/Handler.ashx
@@ -131,6 +131,10 @@ public class Handler : IHttpHandler
                             if (i == 0)
                             {
                                 html += "<td class='TableTitle'>" + "加料时间" + "</td>";
+                            }
+                            if(list[i].Drum == "LT09")
+                            {
+
                             }
                             if (i % 2 == 0)
                             {
@@ -153,9 +157,10 @@ public class Handler : IHttpHandler
                                         //}
                                         else
                                         {
-                                            string lastMaterial =  Function.GetLastMaterialCode(list[i].Drum);
-                                            string currentMaterial = list[i].PartNo;
-                                            if(lastMaterial!= currentMaterial)
+                                            //string lastMaterial =  Function.GetLastMaterialCode(list[i].Drum);
+                                            //string currentMaterial = list[i].PartNo;
+                                            //if(lastMaterial!= currentMaterial)
+                                            if(list[i].Flag == "0")
                                             {
                                                 html += "<td class='tdRed'>" + list[i].Time1 + "</td>";
                                             }
@@ -194,9 +199,10 @@ public class Handler : IHttpHandler
                                         //}
                                         else
                                         {
-                                            string lastMaterial =  Function.GetLastMaterialCode(list[i].Drum);
-                                            string currentMaterial = list[i].PartNo;
-                                            if(lastMaterial!= currentMaterial)
+                                            //string lastMaterial =  Function.GetLastMaterialCode(list[i].Drum);
+                                            //string currentMaterial = list[i].PartNo;
+                                            //if(lastMaterial!= currentMaterial)
+                                            if(list[i].Flag == "0")
                                             {
                                                 html += "<td class='tdRed'>" + list[i].Time1 + "</td>";
                                             }
@@ -317,6 +323,10 @@ public class Handler : IHttpHandler
                             if (i == 5)
                             {
                                 html += "<td class='TableTitle'>" + "加料时间" + "</td>";
+                            }
+                            if(list[i].Drum == "LT09")
+                            {
+
                             }
                             if (i % 2 == 0)
                             {
@@ -338,9 +348,10 @@ public class Handler : IHttpHandler
                                         //}
                                         else
                                         {
-                                            string lastMaterial =  Function.GetLastMaterialCode(list[i].Drum);
-                                            string currentMaterial = list[i].PartNo;
-                                            if(lastMaterial!= currentMaterial)
+                                            //string lastMaterial =  Function.GetLastMaterialCode(list[i].Drum);
+                                            // string currentMaterial = list[i].PartNo;
+                                            //if(lastMaterial!= currentMaterial)
+                                            if(list[i].Flag == "0")
                                             {
                                                 html += "<td class='tdRed'>" + list[i].Time1 + "</td>";
                                             }
@@ -380,9 +391,10 @@ public class Handler : IHttpHandler
                                         //}
                                         else
                                         {
-                                            string lastMaterial =  Function.GetLastMaterialCode(list[i].Drum);
-                                            string currentMaterial = list[i].PartNo;
-                                            if(lastMaterial!= currentMaterial)
+                                            //string lastMaterial =  Function.GetLastMaterialCode(list[i].Drum);
+                                            //string currentMaterial = list[i].PartNo;
+                                            //if(lastMaterial!= currentMaterial)
+                                            if(list[i].Flag == "0")
                                             {
                                                 html += "<td class='tdRed'>" + list[i].Time1 + "</td>";
                                             }
diff --git a/AddMaterial/PaintView.html b/AddMaterial/PaintView.html
index 19cf43d..67da626 100644
--- a/AddMaterial/PaintView.html
+++ b/AddMaterial/PaintView.html
@@ -11,7 +11,7 @@
     <script type="text/javascript">
         // 基于准备好的dom，初始化echarts实例
         $(function () {
-
+           // alert("sdfsdfsdf2");
             ////控件大小自适应
             //pageSize();
 
@@ -30,7 +30,7 @@
 
             var myChart = echarts.init(document.getElementById('main'));
 
-
+       
 
             $.ajax({
                 url: "PaintView.ashx?method=getBar",
@@ -44,7 +44,7 @@
                         var objlist = eval('(' + result + ')');
 
                         myChart.setOption({
-                            
+
                             tooltip: {
                                 trigger: 'axis',
                                 axisPointer: {            // 坐标轴指示器，坐标轴触发有效
@@ -74,8 +74,8 @@
                                     label: {
                                         normal: {
                                             show: true
-                                        },
-                           
+
+                                        }
                                     },
                                     data: objlist.c1
                                 },
diff --git a/AddMaterial/PlanScreen.html b/AddMaterial/PlanScreen.html
index 3185cd5..1c95bb1 100644
--- a/AddMaterial/PlanScreen.html
+++ b/AddMaterial/PlanScreen.html
@@ -164,7 +164,7 @@
             </td>
         </tr>
         <tr>
-            <td>
+            <td height="109">
                 <table id="TableBottom">
                     <tr>
                         <td class="tdTitle">原料名称：</td>
@@ -183,7 +183,7 @@
                         <td colspan="3" class="tdContent" id="content11">&nbsp;</td>
                     </tr>
                 </table>
-            </td>
+          </td>
         </tr>
     </table>
 </body>
diff --git a/AddMaterial/StyleSheet.css b/AddMaterial/StyleSheet.css
index 3cdd2be..3676c0e 100644
--- a/AddMaterial/StyleSheet.css
+++ b/AddMaterial/StyleSheet.css
@@ -12,6 +12,10 @@ table #TableTop, table #TableBottom { width: 1860px; height:400px; font-size:30p
     /*background-color:#B4EEB4;*/ width:260px; background-color:#191970; color:white;word-wrap:break-word;word-break:break-all;
 }
 
+.tdRed {
+    /*background-color:#B4EEB4;*/ width:260px; background-color:#FF0000; color:white;word-wrap:break-word;word-break:break-all;
+}
+
 
 /*#region 标题表格 */
 
@@ -34,16 +38,24 @@ table #TableTop, table #TableBottom { width: 1860px; height:400px; font-size:30p
     font-weight: 800;
     /*background-color:white;*/
     background-color:black; color:white;
-    height:90px;
+    height:220px;
 }
 
 #tdImg, #Img {
-    background-image:url(Pic/Logo.png); background-repeat:no-repeat; width:190px; height:90px;
+    background-image:url(Pic/Logo.png); background-repeat:no-repeat; width:190px; height:190px;
 }
 
 #DivTimer {
-    /*background-color:white;*/ font-size:30px; font-family:黑体; text-align:center; font-weight:500; width:340px; height:95px; background-color:black; color:white; border: 0px;
+	/*background-color:white;*/ font-size:30px;
+	font-family:黑体;
+	text-align:center;
+	font-weight:500;
+	width:340px;
+	height:220px;
+	background-color:black;
+	color:white;
+	border: 0px;
+	top: auto;
 }
 
 /*#endregion */
-
diff --git a/BBMPT.sln b/BBMPT.sln
index 3055002..41f989f 100644
--- a/BBMPT.sln
+++ b/BBMPT.sln
@@ -11,27 +11,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InjectionPC", "InjectionPC\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PaintingPC", "PaintingPC\PaintingPC.csproj", "{BA977F8C-A368-48B9-AD23-965246580D4C}"
 EndProject
-Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "AddMaterial", "http://localhost:10812", "{A1FB4CE7-8397-4811-B8A1-58E55AA1FFB7}"
-	ProjectSection(WebsiteProperties) = preProject
-		UseIISExpress = "true"
-		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.5"
-		Debug.AspNetCompiler.VirtualPath = "/localhost_10812"
-		Debug.AspNetCompiler.PhysicalPath = "AddMaterial\"
-		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_10812\"
-		Debug.AspNetCompiler.Updateable = "true"
-		Debug.AspNetCompiler.ForceOverwrite = "true"
-		Debug.AspNetCompiler.FixedNames = "false"
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.VirtualPath = "/localhost_10812"
-		Release.AspNetCompiler.PhysicalPath = "AddMaterial\"
-		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_10812\"
-		Release.AspNetCompiler.Updateable = "true"
-		Release.AspNetCompiler.ForceOverwrite = "true"
-		Release.AspNetCompiler.FixedNames = "false"
-		Release.AspNetCompiler.Debug = "False"
-		SlnRelativePath = "AddMaterial\"
-	EndProjectSection
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebService", "WebService\WebService.csproj", "{61D9D50E-F645-40DE-8C7A-B4039D840C52}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0D128182-FB8C-4E0B-A42F-DF3767E4DE39}"
@@ -62,6 +41,27 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PunchAndWeld", "PunchAndWel
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FiveScreen", "FiveScreen\FiveScreen.csproj", "{7C80977B-EF23-4658-A6D4-664A12AB67BD}"
 EndProject
+Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "AddMaterial", "AddMaterial\", "{C0121FB6-9A35-45D2-8EDC-943027394E34}"
+	ProjectSection(WebsiteProperties) = preProject
+		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.5"
+		Debug.AspNetCompiler.VirtualPath = "/localhost_57939"
+		Debug.AspNetCompiler.PhysicalPath = "AddMaterial\"
+		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_57939\"
+		Debug.AspNetCompiler.Updateable = "true"
+		Debug.AspNetCompiler.ForceOverwrite = "true"
+		Debug.AspNetCompiler.FixedNames = "false"
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.VirtualPath = "/localhost_57939"
+		Release.AspNetCompiler.PhysicalPath = "AddMaterial\"
+		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_57939\"
+		Release.AspNetCompiler.Updateable = "true"
+		Release.AspNetCompiler.ForceOverwrite = "true"
+		Release.AspNetCompiler.FixedNames = "false"
+		Release.AspNetCompiler.Debug = "False"
+		VWDPort = "57939"
+		SlnRelativePath = "AddMaterial\"
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -94,12 +94,6 @@ Global
 		{BA977F8C-A368-48B9-AD23-965246580D4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BA977F8C-A368-48B9-AD23-965246580D4C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BA977F8C-A368-48B9-AD23-965246580D4C}.Release|x86.ActiveCfg = Release|Any CPU
-		{A1FB4CE7-8397-4811-B8A1-58E55AA1FFB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A1FB4CE7-8397-4811-B8A1-58E55AA1FFB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A1FB4CE7-8397-4811-B8A1-58E55AA1FFB7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A1FB4CE7-8397-4811-B8A1-58E55AA1FFB7}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{A1FB4CE7-8397-4811-B8A1-58E55AA1FFB7}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{A1FB4CE7-8397-4811-B8A1-58E55AA1FFB7}.Release|x86.ActiveCfg = Debug|Any CPU
 		{61D9D50E-F645-40DE-8C7A-B4039D840C52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{61D9D50E-F645-40DE-8C7A-B4039D840C52}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{61D9D50E-F645-40DE-8C7A-B4039D840C52}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -182,6 +176,14 @@ Global
 		{7C80977B-EF23-4658-A6D4-664A12AB67BD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7C80977B-EF23-4658-A6D4-664A12AB67BD}.Release|x86.ActiveCfg = Release|Any CPU
 		{7C80977B-EF23-4658-A6D4-664A12AB67BD}.Release|x86.Build.0 = Release|Any CPU
+		{C0121FB6-9A35-45D2-8EDC-943027394E34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C0121FB6-9A35-45D2-8EDC-943027394E34}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C0121FB6-9A35-45D2-8EDC-943027394E34}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C0121FB6-9A35-45D2-8EDC-943027394E34}.Debug|x86.Build.0 = Debug|Any CPU
+		{C0121FB6-9A35-45D2-8EDC-943027394E34}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{C0121FB6-9A35-45D2-8EDC-943027394E34}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{C0121FB6-9A35-45D2-8EDC-943027394E34}.Release|x86.ActiveCfg = Debug|Any CPU
+		{C0121FB6-9A35-45D2-8EDC-943027394E34}.Release|x86.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/FiveScreen/FrmCenter.Designer.cs b/FiveScreen/FrmCenter.Designer.cs
index 7a7a2bd..aed682d 100644
--- a/FiveScreen/FrmCenter.Designer.cs
+++ b/FiveScreen/FrmCenter.Designer.cs
@@ -37,24 +37,24 @@
             // webBrowser1
             // 
             this.webBrowser1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.webBrowser1.Location = new System.Drawing.Point(0, 129);
+            this.webBrowser1.Location = new System.Drawing.Point(0, 172);
             this.webBrowser1.Margin = new System.Windows.Forms.Padding(0);
-            this.webBrowser1.MinimumSize = new System.Drawing.Size(30, 30);
+            this.webBrowser1.MinimumSize = new System.Drawing.Size(40, 40);
             this.webBrowser1.Name = "webBrowser1";
             this.webBrowser1.ScrollBarsEnabled = false;
-            this.webBrowser1.Size = new System.Drawing.Size(2856, 1467);
+            this.webBrowser1.Size = new System.Drawing.Size(5077, 2665);
             this.webBrowser1.TabIndex = 3;
-            this.webBrowser1.Tag = "http://10.60.101.10:8005/Manage/PaintingResultScreen2.html";
-            this.webBrowser1.Url = new System.Uri("http://localhost:84/Manage/PaintingResultScreen2.html", System.UriKind.Absolute);
+            this.webBrowser1.Tag = "http://localhost:84/Manage/PaintingResultScreen2.html";
+            this.webBrowser1.Url = new System.Uri("http://10.60.101.10:8005/Manage/PaintingResultScreen2.html", System.UriKind.Absolute);
             // 
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.Transparent;
             this.panel1.ForeColor = System.Drawing.Color.Transparent;
-            this.panel1.Location = new System.Drawing.Point(1846, 3);
-            this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panel1.Location = new System.Drawing.Point(2461, 4);
+            this.panel1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(998, 88);
+            this.panel1.Size = new System.Drawing.Size(1331, 117);
             this.panel1.TabIndex = 4;
             this.panel1.DoubleClick += new System.EventHandler(this.panel1_DoubleClick);
             // 
@@ -66,27 +66,28 @@
             this.tableLayoutPanel1.Controls.Add(this.webBrowser1, 0, 1);
             this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
+            this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";
             this.tableLayoutPanel1.RowCount = 2;
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 129F));
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 172F));
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(2856, 1596);
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(5077, 2837);
             this.tableLayoutPanel1.TabIndex = 5;
             this.tableLayoutPanel1.DoubleClick += new System.EventHandler(this.tableLayoutPanel1_DoubleClick);
             // 
             // FrmCenter
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.ControlText;
             this.BackgroundImage = global::FiveScreen.Properties.Resources.底图;
-            this.ClientSize = new System.Drawing.Size(3808, 2128);
+            this.ClientSize = new System.Drawing.Size(5077, 2837);
             this.ControlBox = false;
             this.Controls.Add(this.tableLayoutPanel1);
             this.Controls.Add(this.panel1);
             this.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.MinimumSize = new System.Drawing.Size(22, 22);
+            this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.MinimumSize = new System.Drawing.Size(26, 26);
             this.Name = "FrmCenter";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.TransparencyKey = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
diff --git a/MESClassLibrary/BLL/Mistake243/RecordBLL.cs b/MESClassLibrary/BLL/Mistake243/RecordBLL.cs
index ebd5164..7514ea5 100644
--- a/MESClassLibrary/BLL/Mistake243/RecordBLL.cs
+++ b/MESClassLibrary/BLL/Mistake243/RecordBLL.cs
@@ -12,6 +12,46 @@ namespace MESClassLibrary.BLL.Mistake243
 {
     public class RecordBLL
     {
+        private RecordDAL _recordDAL = new RecordDAL();
+        #region 轮眉
+        /// <summary>
+        /// X243 前部左侧轮眉 
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX243FL_LM()
+        {
+            return _recordDAL.GetX243FL_LM();
+        }
+        /// <summary>
+        /// X243 后部左侧轮眉
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX243HL_LM()
+        {
+            return _recordDAL.GetX243HL_LM();
+        }
+        /// <summary>
+        /// X243 前部右侧轮眉 
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX243FR_LM()
+        {
+            return _recordDAL.GetX243FR_LM();
+        }
+
+        /// <summary>
+        /// X247 后部右侧后轮眉  1230002617
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX243HRH_LM()
+        {
+            return _recordDAL.GetX243HRH_LM();
+        }
+
+        #endregion
+
+
+
         public DataTable SearchByPartNo1(string PartNo)
         {
             RecordDAL da = new RecordDAL();
diff --git a/MESClassLibrary/BLL/Mistake247/BoxBLL.cs b/MESClassLibrary/BLL/Mistake247/BoxBLL.cs
index 9091c69..e17384a 100644
--- a/MESClassLibrary/BLL/Mistake247/BoxBLL.cs
+++ b/MESClassLibrary/BLL/Mistake247/BoxBLL.cs
@@ -14,39 +14,196 @@ namespace MESClassLibrary.BLL.Mistake247
     public class BoxBLL
     {
         private BoxDAL _boxDAL = new BoxDAL();
+
+        #region 门板
         /// <summary>
         /// 左前
         /// </summary>
         /// <returns></returns>
-        public DataTable GetX247LF()
+        public DataTable GetX247LF_MB()
         {
-            return _boxDAL.GetX247LF();
+            return _boxDAL.GetX247LF_MB();
         }
         /// <summary>
         /// 左后
         /// </summary>
         /// <returns></returns>
-        public DataTable GetX247LR()
+        public DataTable GetX247LR_MB()
         {
-            return _boxDAL.GetX247LR();
+            return _boxDAL.GetX247LR_MB();
         }
         /// <summary>
         /// 右前
         /// </summary>
         /// <returns></returns>
-        public DataTable GetX247RF()
+        public DataTable GetX247RF_MB()
         {
-            return _boxDAL.GetX247RF();
+            return _boxDAL.GetX247RF_MB();
         }
         /// <summary>
         /// 右后
         /// </summary>
         /// <returns></returns>
-        public DataTable GetX247RR()
+        public DataTable GetX247RR_MB()
+        {
+            return _boxDAL.GetX247RR_MB();
+        }
+        #endregion
+
+        #region 轮眉
+        /// <summary>
+        /// 前左
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX247LF_LM()
+        {
+            return _boxDAL.GetX247LF_LM();
+        }
+        /// <summary>
+        /// 前右
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX247RF_LM()
+        {
+            return _boxDAL.GetX247RF_LM();
+        }
+        /// <summary>
+        /// 后左轮眉   -轮眉后左后和后左一样
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX247LR_LM()
+        {
+            return _boxDAL.GetX247LR_LM();
+        }
+
+        /// <summary>
+        /// 后右  --大装箱单
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX247RR_LM()
+        {
+            return _boxDAL.GetX247RR_LM();
+        }
+
+        /// <summary>
+        /// 后左前轮眉  
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX247HLF_LM()
+        {
+            return _boxDAL.GetX247HLF_LM();
+        }
+        /// <summary>
+        /// 后左后轮眉  
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX247HLH_LM()
+        {
+            return _boxDAL.GetX247HLH_LM();
+        }
+
+        /// <summary>
+        /// 后右前轮眉  
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX247HRF_LM()
+        {
+            return _boxDAL.GetX247HRF_LM();
+        }
+        /// <summary>
+          /// 后右后轮眉  
+          /// </summary>
+          /// <returns></returns>
+        public DataTable GetX247HRH_LM()
+        {
+            return _boxDAL.GetX247HRH_LM();
+        }
+
+        #region X243轮眉
+        /// <summary>
+        /// 前左
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX243LF_LM()
+        {
+            return _boxDAL.GetX243LF_LM();
+        }
+        /// <summary>
+        /// 后左轮眉   
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX243LR_LM()
+        {
+            return _boxDAL.GetX243LR_LM();
+        }
+        /// <summary>
+        /// 前右
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX243RF_LM()
+        {
+            return _boxDAL.GetX243RF_LM();
+        }
+
+        /// <summary>
+        /// 后右后轮眉  
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX243HRH_LM()
+        {
+            return _boxDAL.GetX243HRH_LM();
+        }
+        #endregion
+
+
+        #endregion
+
+        #region 扰流板
+        /// <summary>
+        /// 后扰流板箱单   --大装箱单
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX247H_RLB()
+        {
+            return _boxDAL.GetX247H_RLB();
+        }
+        /// <summary>
+        /// X247后部左侧扰流板
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX247HL_RLB()
+        {
+            return _boxDAL.GetX247HL_RLB();
+        }
+        /// <summary>
+        /// X247后部右侧扰流板
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX247HR_RLB()
+        {
+            return _boxDAL.GetX247HR_RLB();
+        }
+
+
+        /// <summary>
+        /// H247后部左侧扰流板
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetH247HL_RLB()
         {
-            return _boxDAL.GetX247RR();
+            return _boxDAL.GetH247HL_RLB();
         }
+        /// <summary>
+        /// H247后部右侧扰流板
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetH247HR_RLB()
+        {
+            return _boxDAL.GetH247HR_RLB();
+        }
+
 
+        #endregion
 
         public bool AddInfo(BoxModel md)
         {
diff --git a/MESClassLibrary/BLL/Mistake247/Plan247BLL.cs b/MESClassLibrary/BLL/Mistake247/Plan247BLL.cs
index fbcbf4b..7c8cfb2 100644
--- a/MESClassLibrary/BLL/Mistake247/Plan247BLL.cs
+++ b/MESClassLibrary/BLL/Mistake247/Plan247BLL.cs
@@ -38,7 +38,12 @@ namespace MESClassLibrary.BLL.Mistake247
                 return null;
             }
         }
-
+        /// <summary>
+        /// 计划是否完成 IsFinish =0的数据
+        /// </summary>
+        /// <param name="partNo1"></param>
+        /// <param name="orderNo"></param>
+        /// <returns></returns>
         public DataTable IsHavePlan(string partNo1, string orderNo)
         {
             Plan247DAL da = new Plan247DAL();
diff --git a/MESClassLibrary/BLL/Mistake247/RecordBLL.cs b/MESClassLibrary/BLL/Mistake247/RecordBLL.cs
index c6ecef5..e976951 100644
--- a/MESClassLibrary/BLL/Mistake247/RecordBLL.cs
+++ b/MESClassLibrary/BLL/Mistake247/RecordBLL.cs
@@ -19,6 +19,7 @@ namespace MESClassLibrary.BLL.Mistake247
         {
             return _recordDAL.SearchQLevel(stockNo, partCode);
         }
+        #region 门板
         /// <summary>
         /// 左前
         /// </summary>
@@ -53,6 +54,114 @@ namespace MESClassLibrary.BLL.Mistake247
         }
 
 
+        #endregion
+
+        #region 轮眉
+
+        /// <summary>
+        /// X247 前部左侧轮眉  1230002609
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetLMX247LF()
+        {
+            return _recordDAL.GetLMX247LF();
+        }
+        /// <summary>
+        /// X247 后部左侧轮眉   1230002615
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetLMX247LH()
+        {
+            return _recordDAL.GetLMX247LH();
+        }
+        /// <summary>
+        /// X247 前部右侧轮眉  1230002612
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetLMX247FR()
+        {
+            return _recordDAL.GetLMX247FR();
+        }
+
+        /// <summary>
+        /// X247 后部右侧后轮眉  1230002617
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetLMX247RHH()
+        {
+            return _recordDAL.GetLMX247HRH();
+        }
+        /// <summary>
+        /// X247 后部左侧前轮眉  
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetLMX247HLF()
+        {
+            return _recordDAL.GetLMX247HLF();
+        }
+        /// <summary>
+        /// X247 后部左侧后轮眉  1230002619
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetLMX247HLH()
+        {
+            return _recordDAL.GetLMX247HLH();
+        }
+        /// <summary>
+        /// X247 后部右侧前轮眉  1230002621
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetLMX247HRF()
+        {
+            return _recordDAL.GetLMX247HRF();
+        }
+
+        /// <summary>
+         /// X247 后部右侧后轮眉  1230002621
+         /// </summary>
+         /// <returns></returns>
+        public DataTable GetLMX247HRH()
+        {
+            return _recordDAL.GetLMX247HRH();
+        }
+        #endregion
+
+        #region 扰流板
+
+        /// <summary>
+        /// X247后部左侧扰流板
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX247SpoilerHL()
+        {
+            return _recordDAL.GetX247SpoilerHL();
+        }
+        /// <summary>
+        /// X247后部右侧扰流板
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX247SpoilerHR()
+        {
+            return _recordDAL.GetX247SpoilerHR();
+        }
+        /// <summary>
+        /// H247后部左侧扰流板
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetH247SpoilerHL()
+        {
+            return _recordDAL.GetH247SpoilerHL();
+        }
+        /// <summary>
+        /// H247后部右侧扰流板
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetH247SpoilerHR()
+        {
+            return _recordDAL.GetH247SpoilerHR();
+        }
+
+        #endregion
 
         public DataTable SearchByPartNo1(string PartNo)
         {
diff --git a/MESClassLibrary/DAL/Mistake243/Assembly243DAL.cs b/MESClassLibrary/DAL/Mistake243/Assembly243DAL.cs
index 87420b4..1450535 100644
--- a/MESClassLibrary/DAL/Mistake243/Assembly243DAL.cs
+++ b/MESClassLibrary/DAL/Mistake243/Assembly243DAL.cs
@@ -18,7 +18,7 @@ namespace MESClassLibrary.DAL.Mistake243
         {
             try
             {
-                string sql = @"SELECT top 1 PartNo from tb_Assembly_243 where PartNo like '" + partNo +
+                string sql = @"SELECT top 1 * from tb_Assembly_243 where PartNo like '" + partNo +
                              "%' and Flag=0 order by CreateTime desc";
                 //SqlParameter[] param = new SqlParameter[1];
 
diff --git a/MESClassLibrary/DAL/Mistake243/RecordDAL.cs b/MESClassLibrary/DAL/Mistake243/RecordDAL.cs
index 5640682..7ade3fc 100644
--- a/MESClassLibrary/DAL/Mistake243/RecordDAL.cs
+++ b/MESClassLibrary/DAL/Mistake243/RecordDAL.cs
@@ -14,6 +14,60 @@ namespace MESClassLibrary.DAL.Mistake243
     {
         public static string TableName = "tb_Record_243";
 
+        #region 轮眉
+        /// <summary>
+        /// X243 前部左侧轮眉 
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX243FL_LM()
+        {
+            string sql = "SELECT * FROM [dbo].[tb_Assembly_243] WHERE PartNo like '%A2438808501%' AND PrintTime IS NULL ORDER BY CreateTime";
+            return GetDoorAssemble(sql);
+        }
+
+        /// <summary>
+        /// X243 后部左侧轮眉
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX243HL_LM()
+        {
+            string sql = "SELECT * FROM [dbo].[tb_Assembly_243] WHERE PartNo like '%A2478850222%' AND PrintTime IS NULL ORDER BY CreateTime";
+            return GetDoorAssemble(sql);
+        }
+        /// <summary>
+        /// X243 前部右侧轮眉 
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX243FR_LM()
+        {
+            string sql = "SELECT * FROM [dbo].[tb_Assembly_243] WHERE PartNo like '%A2438808601%' AND PrintTime IS NULL ORDER BY CreateTime";
+            return GetDoorAssemble(sql);
+        }
+        /// <summary>
+        /// X243 后部右侧后轮眉
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX243HRH_LM()
+        {
+            string sql = "SELECT * FROM [dbo].[tb_Assembly_243] WHERE PartNo like '%A2478850322%' AND PrintTime IS NULL ORDER BY CreateTime";
+            return GetDoorAssemble(sql);
+        }
+        #endregion
+
+        DataTable GetDoorAssemble(string sql)
+        {
+            try
+            {
+                SqlParameter[] param = new SqlParameter[0];
+                return SqlHelper.ExecuteDataset(SqlHelper.GetConnSting(), CommandType.Text, sql, param).Tables[0];
+            }
+            catch (Exception ex)
+            {
+                LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+                return null;
+            }
+        }
+
         /// <summary>
         /// 查找半成品是否已经装配
         /// </summary>
diff --git a/MESClassLibrary/DAL/Mistake247/AssemblyDAL.cs b/MESClassLibrary/DAL/Mistake247/AssemblyDAL.cs
index e0b0268..aaf7802 100644
--- a/MESClassLibrary/DAL/Mistake247/AssemblyDAL.cs
+++ b/MESClassLibrary/DAL/Mistake247/AssemblyDAL.cs
@@ -188,7 +188,8 @@ namespace MESClassLibrary.DAL.Mistake247
         {
             try
             {
-                string sql = @"SELECT top 1 PartNo from tb_Assembly_247 where PartNo like '" + partNo + "%' and Flag=0 order by CreateTime desc";
+                //string sql = @"SELECT top 1 PartNo from tb_Assembly_247 where PartNo like '" + partNo + "%' and Flag=0 order by CreateTime desc";
+                string sql = @"SELECT top 1 * from tb_Assembly_247 where PartNo like '" + partNo + "%' and Flag=0 order by CreateTime desc";
                 //SqlParameter[] param = new SqlParameter[1];
 
                 //param[0] = new SqlParameter("@PartNo", SqlDbType.VarChar);
diff --git a/MESClassLibrary/DAL/Mistake247/BoxDAL.cs b/MESClassLibrary/DAL/Mistake247/BoxDAL.cs
index 3eae9f5..f86190e 100644
--- a/MESClassLibrary/DAL/Mistake247/BoxDAL.cs
+++ b/MESClassLibrary/DAL/Mistake247/BoxDAL.cs
@@ -18,12 +18,12 @@ namespace MESClassLibrary.DAL.Mistake247
 
 
 
-
+        #region 门板
         /// <summary>
         /// 左前
         /// </summary>
         /// <returns></returns>
-        public DataTable GetX247LF()
+        public DataTable GetX247LF_MB()
         {
             string sql = "SELECT top 1 *  FROM [dbo].[tb_Box_247] WHERE PartNo in('A2477204606','A2477204806','A2477205006') AND [PrintTime] IS NULL  ORDER BY [CreateTime]";
             return GetDoorAssemble(sql);
@@ -32,7 +32,7 @@ namespace MESClassLibrary.DAL.Mistake247
         /// 左后
         /// </summary>
         /// <returns></returns>
-        public DataTable GetX247LR()
+        public DataTable GetX247LR_MB()
         {
             string sql = "SELECT top 1 *  FROM [dbo].[tb_Box_247] WHERE PartNo in('A2477305303','A2477305503','A2477305703') AND [PrintTime] IS NULL  ORDER BY [CreateTime]";
             return GetDoorAssemble(sql);
@@ -41,7 +41,7 @@ namespace MESClassLibrary.DAL.Mistake247
         /// 右前
         /// </summary>
         /// <returns></returns>
-        public DataTable GetX247RF()
+        public DataTable GetX247RF_MB()
         {
             string sql = "SELECT top 1 *  FROM [dbo].[tb_Box_247] WHERE PartNo in('A2477204706','A2477204906','A2477205106') AND [PrintTime] IS NULL  ORDER BY [CreateTime]";
             return GetDoorAssemble(sql);
@@ -50,11 +50,217 @@ namespace MESClassLibrary.DAL.Mistake247
         /// 右后
         /// </summary>
         /// <returns></returns>
-        public DataTable GetX247RR()
+        public DataTable GetX247RR_MB()
         {
             string sql = "SELECT top 1 *  FROM [dbo].[tb_Box_247] WHERE PartNo in('A2477305603','A2477305403','A2477305803') AND [PrintTime] IS NULL  ORDER BY [CreateTime]";
             return GetDoorAssemble(sql);
         }
+        #endregion
+
+        #region 轮眉
+        /// <summary>
+        /// 轮眉前左
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX247LF_LM()
+        {
+            string sql = "SELECT top 1  * FROM [dbo].[tb_Box_247] WHERE PartNo ='A2478850022' AND [PrintTime] IS NULL  ORDER BY [CreateTime]";
+            return GetDoorAssemble(sql);
+        }
+        /// <summary>
+        /// 轮眉前右
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX247RF_LM()
+        {
+            string sql = "SELECT top 1  * FROM [dbo].[tb_Box_247] WHERE PartNo ='A2478850122' AND [PrintTime] IS NULL  ORDER BY [CreateTime]";
+            return GetDoorAssemble(sql);
+        }
+        /// <summary>
+        /// 轮眉后左  -轮眉后左后和后左一样
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX247LR_LM()
+        {
+            string sql = "SELECT top 1  * FROM [dbo].[tb_Box_247] WHERE PartNo ='A2478850222' AND [PrintTime] IS NULL  ORDER BY [CreateTime]";
+            return GetDoorAssemble(sql);
+        }
+        
+        /// <summary>
+        /// 轮眉后右  --大装箱单
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX247RR_LM()
+        {
+            string sql = "SELECT top 1  * FROM [dbo].[tb_Box_247] WHERE PartNo ='A2478850322' AND [PrintTime] IS NULL  ORDER BY [CreateTime]";
+            return GetDoorAssemble(sql);
+        }
+        
+        /// <summary>
+        /// 后左前轮眉
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX247HLF_LM()
+        {
+            string sql = "SELECT * FROM [dbo].[tb_Box_247] WHERE PartNo ='A2477309400' AND [PrintTime] IS NULL  ORDER BY [CreateTime]";
+            return GetDoorAssemble(sql);
+        }
+        /// <summary>
+        /// 后左后轮眉 和后左一样
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX247HLH_LM()
+        {
+            string sql = "SELECT top 1  * FROM [dbo].[tb_Box_247] WHERE PartNo ='A2478850222' AND [PrintTime] IS NULL  ORDER BY [CreateTime]";
+            return GetDoorAssemble(sql);
+        }
+        /// <summary>
+        /// 后右前轮眉
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX247HRF_LM()
+        {
+            string sql = "SELECT * FROM [dbo].[tb_Box_247] WHERE PartNo ='A2477309600' AND [PrintTime] IS NULL  ORDER BY [CreateTime]";
+            return GetDoorAssemble(sql);
+        }
+        /// <summary>
+        /// 后右后轮眉
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX247HRH_LM()
+        {
+            string sql = "SELECT * FROM [dbo].[tb_Box_247] WHERE PartNo ='A2478850322' AND [PrintTime] IS NULL  ORDER BY [CreateTime]";
+            return GetDoorAssemble(sql);
+        }
+
+        #region X243轮眉
+        /// <summary>
+        ///  前左 --X243
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX243LF_LM()
+        {
+            string sql = "SELECT * FROM [dbo].[tb_Box_243] WHERE PartNo ='A2438808501' AND [PrintTime] IS NULL  ORDER BY [CreateTime]";
+            return GetDoorAssemble(sql);
+        }
+        /// <summary>
+        /// 后左轮眉    --X243
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX243LR_LM()
+        {
+            string sql = "SELECT * FROM [dbo].[tb_Box_243] WHERE PartNo ='A2478850222' AND [PrintTime] IS NULL  ORDER BY [CreateTime]";
+            return GetDoorAssemble(sql);
+        }
+        /// <summary>
+        /// 前右   --X243
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX243RF_LM()
+        {
+            string sql = "SELECT * FROM [dbo].[tb_Box_243] WHERE PartNo ='A2438808601' AND [PrintTime] IS NULL  ORDER BY [CreateTime]";
+            return GetDoorAssemble(sql);
+        }
+        /// <summary> 
+        /// 后右后轮眉    --X243
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX243HRH_LM()
+        {
+            string sql = "SELECT * FROM [dbo].[tb_Box_243] WHERE PartNo ='A2478850322' AND [PrintTime] IS NULL  ORDER BY [CreateTime]";
+            return GetDoorAssemble(sql);
+        }
+        #endregion
+
+        #endregion
+
+        #region 扰流板
+        /// <summary>
+        /// X247后部扰流板装箱单   --大装箱单
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX247H_RLB()
+        {
+            string sql = "SELECT top 1  * FROM [dbo].[tb_Box_247] WHERE PartNo='A2477900588' AND [PrintTime] IS NULL  ORDER BY [CreateTime]";
+            return GetDoorAssemble(sql);
+        }
+        /// <summary>
+        /// X247后部左侧扰流板装箱单
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX247HL_RLB()
+        {
+            string sql = "SELECT * FROM [dbo].[tb_Box_247] WHERE PartNo ='A2477901300' AND [PrintTime] IS NULL  ORDER BY [CreateTime]";
+            return GetDoorAssemble(sql);
+        }
+        /// <summary>
+        /// X247后部右侧扰流板装箱单
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX247HR_RLB()
+        {
+            string sql = "SELECT * FROM [dbo].[tb_Box_247] WHERE PartNo ='A2477901400' AND [PrintTime] IS NULL  ORDER BY [CreateTime]";
+            return GetDoorAssemble(sql);
+        }
+
+        /// <summary>
+        /// H247 后部左侧扰流板装箱单
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetH247HL_RLB()
+        {
+            string sql = "SELECT * FROM [dbo].[tb_Box_247] WHERE PartNo ='A2477900300' AND [PrintTime] IS NULL  ORDER BY [CreateTime]";
+            return GetDoorAssemble(sql);
+        }
+        /// <summary>
+        /// H247 后部右侧扰流板装箱单
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetH247HR_RLB()
+        {
+            string sql = "SELECT * FROM [dbo].[tb_Box_247] WHERE PartNo ='A2477900400' AND [PrintTime] IS NULL  ORDER BY [CreateTime]";
+            return GetDoorAssemble(sql);
+        }
+        ///// <summary>
+        ///// 扰流板前左
+        ///// </summary>
+        ///// <returns></returns>
+        //public DataTable GetX247LF_RLB()
+        //{
+        //    string sql = "";
+        //    return GetDoorAssemble(sql);
+        //}
+        ///// <summary>
+        ///// 扰流板前右
+        ///// </summary>
+        ///// <returns></returns>
+        //public DataTable GetX247RF_RLB()
+        //{
+        //    string sql = "";
+        //    return GetDoorAssemble(sql);
+        //}
+
+        ///// <summary>
+        ///// 扰流板后左
+        ///// </summary>
+        ///// <returns></returns>
+        //public DataTable GetX247LR_RLB()
+        //{
+        //    string sql = "";
+        //    return GetDoorAssemble(sql);
+        //}
+
+        ///// <summary>
+        ///// 扰流板后右
+        ///// </summary>
+        ///// <returns></returns>
+        //public DataTable GetX247RR_RLB()
+        //{
+        //    string sql = "";
+        //    return GetDoorAssemble(sql);
+        //}
+        #endregion
+
         DataTable GetDoorAssemble(string sql)
         {
             try
diff --git a/MESClassLibrary/DAL/Mistake247/RecordDAL.cs b/MESClassLibrary/DAL/Mistake247/RecordDAL.cs
index 0894a00..58df6f6 100644
--- a/MESClassLibrary/DAL/Mistake247/RecordDAL.cs
+++ b/MESClassLibrary/DAL/Mistake247/RecordDAL.cs
@@ -52,8 +52,7 @@ namespace MESClassLibrary.DAL.Mistake247
 
             }
         }
-
-
+        #region 门板
         /// <summary>
         /// 左前
         /// </summary>
@@ -63,6 +62,7 @@ namespace MESClassLibrary.DAL.Mistake247
             string sql = "SELECT top 1 * FROM [dbo].[tb_Assembly_247] WHERE substring(PartNo,1,11) in ('A2477203007','A2477203207','A2477205006' )AND PrintTime IS NULL ORDER BY CreateTime";
             return GetDoorAssemble(sql);
         }
+
         /// <summary>
         /// 左后
         /// </summary>
@@ -90,6 +90,121 @@ namespace MESClassLibrary.DAL.Mistake247
             string sql = "SELECT  top 1 *  FROM [dbo].[tb_Assembly_247] WHERE SUBSTRING(PartNo,1,11) in('A2477305603','A2477305403','A2477305803') AND PrintTime IS NULL ORDER BY CreateTime";
             return GetDoorAssemble(sql);
         }
+        #endregion
+
+        #region 轮眉
+        /// <summary>
+        /// X247 前部左侧轮眉  1230002609
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetLMX247LF()
+        {
+            string sql = "SELECT * FROM [dbo].[tb_Assembly_247] WHERE PartNo like '%A2478850022%' AND PrintTime IS NULL ORDER BY CreateTime";
+            return GetDoorAssemble(sql);
+        }
+        /// <summary>
+        /// X247 后部左侧轮眉   1230002615
+        /// </summary>SELECT * FROM [dbo].[tb_Box_247] WHERE PartNo ='A2478850222' AND [PrintTime] IS NULL  ORDER BY [CreateTime]
+        /// <returns></returns>
+        public DataTable GetLMX247LH()
+        {
+            string sql = "SELECT * FROM [dbo].[tb_Assembly_247] WHERE PartNo like '%A2478850222%' AND PrintTime IS NULL ORDER BY CreateTime";
+            return GetDoorAssemble(sql);
+        }
+        /// <summary>
+        /// X247 前部右侧轮眉  1230002612
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetLMX247FR()
+        {
+            string sql = "SELECT * FROM [dbo].[tb_Assembly_247] WHERE PartNo like '%A2478850122%' AND PrintTime IS NULL ORDER BY CreateTime";
+            return GetDoorAssemble(sql);
+        }
+
+      
+        /// <summary>
+        /// X247 后部左侧前轮眉  1230002619
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetLMX247HLF()
+        { 
+            string sql = "SELECT * FROM [dbo].[tb_Assembly_247] WHERE PartNo like '%A2477309400%' AND PrintTime IS NULL ORDER BY CreateTime";
+            return GetDoorAssemble(sql);
+        }
+        /// <summary>
+        /// X247 后部左侧后轮眉  1230002619
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetLMX247HLH()
+        {
+            string sql = "SELECT * FROM [dbo].[tb_Assembly_247] WHERE PartNo like '%A2478850222%' AND PrintTime IS NULL ORDER BY CreateTime";
+            return GetDoorAssemble(sql);
+        }
+        
+        /// <summary>
+        /// X247 后部右侧前轮眉  1230002621
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetLMX247HRF()
+        { 
+            string sql = "SELECT * FROM [dbo].[tb_Assembly_247] WHERE PartNo like '%A2477309600%' AND PrintTime IS NULL ORDER BY CreateTime";
+            return GetDoorAssemble(sql);
+        }
+        /// <summary>
+        /// X247 后部右侧后轮眉 
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetLMX247HRH()
+        {
+            string sql = "SELECT * FROM [dbo].[tb_Assembly_247] WHERE PartNo like '%A2478850322%' AND PrintTime IS NULL ORDER BY CreateTime";
+            return GetDoorAssemble(sql);
+        }
+
+
+        #endregion
+
+        #region 扰流板
+        /// <summary>
+        ///  X247后部左侧扰流板
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX247SpoilerHL()
+        {
+            string sql = "SELECT * FROM [dbo].[tb_Assembly_247] WHERE PartNo LIKE 'A2477901300%' AND PrintTime IS NULL ORDER BY CreateTime";
+            return GetDoorAssemble(sql);
+        }
+        /// <summary>
+        ///  X247后部右侧扰流板
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetX247SpoilerHR()
+        {
+            string sql = "SELECT * FROM [dbo].[tb_Assembly_247] WHERE PartNo LIKE 'A2477901400%' AND PrintTime IS NULL ORDER BY CreateTime";
+            return GetDoorAssemble(sql);
+        }
+      
+        /// <summary>
+        ///  H247后部左侧扰流板
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetH247SpoilerHL()
+        {
+            string sql = "SELECT * FROM [dbo].[tb_Assembly_247] WHERE PartNo LIKE 'A2477900300%' AND PrintTime IS NULL ORDER BY CreateTime";
+            return GetDoorAssemble(sql);
+        }
+        /// <summary>
+        ///  H247后部右侧扰流板
+        /// </summary>
+        /// <returns></returns>
+        public DataTable GetH247SpoilerHR()
+        {
+            string sql = "SELECT * FROM [dbo].[tb_Assembly_247] WHERE PartNo LIKE 'A2477900400%' AND PrintTime IS NULL ORDER BY CreateTime";
+            return GetDoorAssemble(sql);
+        }
+        #endregion
+
+
+
         DataTable GetDoorAssemble(string sql)
         {
             try
diff --git a/MESWebSite/MESWebSite.csproj b/MESWebSite/MESWebSite.csproj
index 0e790c8..ccdbd58 100644
--- a/MESWebSite/MESWebSite.csproj
+++ b/MESWebSite/MESWebSite.csproj
@@ -108,6 +108,9 @@
     <Content Include="images\welcome_bg.gif">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="images\北汽模塑.gif">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Login.aspx" />
     <Content Include="Manage\AppendColorSearch.aspx" />
     <Content Include="Manage\BucketInfo.aspx" />
diff --git a/MESWebSite/Manage/Index.aspx b/MESWebSite/Manage/Index.aspx
index dbebc5d..d9fbca8 100644
--- a/MESWebSite/Manage/Index.aspx
+++ b/MESWebSite/Manage/Index.aspx
@@ -418,12 +418,12 @@
         </div>
         <div id="divcenter" data-options="region:'center',border:false" style="width: auto;">
             <div id="tabmain" class="easyui-tabs" data-options="onSelect:tabSelected">
-                <div title="欢迎" data-options="iconCls:'icon-tip',closable:false" style="padding: 10px; background-image:url('../images/centerBg.png'); background-repeat:no-repeat;background-position:center; min-height: 551px;">
+                <div title="欢迎" data-options="iconCls:'icon-tip',closable:false" style="padding: 0px; background-image:url('../images/北汽模塑.gif'); background-size:cover;background-repeat:no-repeat;background-position:center; min-height: 551px;">
                     
                     <div id="divwelcome" >
 
  
-                        <div title="服务器信息" style="padding: 10px;"> 
+                        <div title="服务器信息" style="padding: 0px;"> 
                             <p style="font-size: 14px">
                                 <asp:Literal ID="ServerInformation" runat="server" Visible="false"></asp:Literal>
                             </p>
diff --git a/MESWebSite/images/北汽模塑.gif b/MESWebSite/images/北汽模塑.gif
new file mode 100644
index 0000000..e9692a1
Binary files /dev/null and b/MESWebSite/images/北汽模塑.gif differ
diff --git a/PaintingScreen/Manage/PaintingResultScreen2.html b/PaintingScreen/Manage/PaintingResultScreen2.html
index b6ca4b5..d3b216f 100644
--- a/PaintingScreen/Manage/PaintingResultScreen2.html
+++ b/PaintingScreen/Manage/PaintingResultScreen2.html
@@ -12,12 +12,12 @@
     <link href="../CSS/InitCSS.css" rel="stylesheet" />
     <script>
         $(function () {
-            //createTable();
+            createTable();
             initTable2();
             initTable1();
-            setInterval("createTable()", 120000);  //每十秒生成中间数据
-            setInterval("initTable2()", 3000 * 10);  //每三秒刷新总计数据
-            setInterval("initTable1()", 6000 * 10);  //每六秒刷新中间数据
+            setInterval("createTable()", 10000);  //每十秒生成中间数据
+            setInterval("initTable2()", 3000 * 1);  //每三秒刷新总计数据
+            setInterval("initTable1()", 6000 * 1);  //每六秒刷新中间数据
         });
 
         function createTable() {
diff --git a/PaintingScreen/Manage/PaintingScreenPaoGuang.html b/PaintingScreen/Manage/PaintingScreenPaoGuang.html
index 362670b..273b070 100644
--- a/PaintingScreen/Manage/PaintingScreenPaoGuang.html
+++ b/PaintingScreen/Manage/PaintingScreenPaoGuang.html
@@ -11,7 +11,7 @@
     <link href="../CSS/StyleSheetCommon.css" rel="stylesheet" />
     <script>
         $(function () {
-            //CreateMiddleTable(); //取消注释后,初始时频繁反复刷新
+            CreateMiddleTable(); //取消注释后,初始时频繁反复刷新
             GetSumTable();
             GetSumRateTable();
             GetMiddleTablePaoGuang();
diff --git a/PaintingView/Form1.Designer.cs b/PaintingView/Form1.Designer.cs
index 1a36d07..58aff90 100644
--- a/PaintingView/Form1.Designer.cs
+++ b/PaintingView/Form1.Designer.cs
@@ -66,9 +66,10 @@
             // 
             this.label2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.label2.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(1245, 9);
+            this.label2.Location = new System.Drawing.Point(2283, 16);
+            this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(192, 84);
+            this.label2.Size = new System.Drawing.Size(350, 146);
             this.label2.TabIndex = 6;
             this.label2.Text = "2019-05-29  10:30:31";
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -78,9 +79,10 @@
             // 
             this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
-            this.pictureBox1.Location = new System.Drawing.Point(6, 9);
+            this.pictureBox1.Location = new System.Drawing.Point(11, 16);
+            this.pictureBox1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(169, 84);
+            this.pictureBox1.Size = new System.Drawing.Size(308, 146);
             this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
             this.pictureBox1.TabIndex = 5;
             this.pictureBox1.TabStop = false;
@@ -89,9 +91,10 @@
             // 
             this.label1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.label1.Font = new System.Drawing.Font("宋体", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(174, 9);
+            this.label1.Location = new System.Drawing.Point(319, 16);
+            this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(1074, 84);
+            this.label1.Size = new System.Drawing.Size(1967, 146);
             this.label1.TabIndex = 4;
             this.label1.Text = "喷涂车间入库记录";
             this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -99,20 +102,23 @@
             // panel1
             // 
             this.panel1.Controls.Add(this.webBrowser1);
-            this.panel1.Location = new System.Drawing.Point(6, 94);
+            this.panel1.Location = new System.Drawing.Point(11, 164);
+            this.panel1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1431, 406);
+            this.panel1.Size = new System.Drawing.Size(2624, 710);
             this.panel1.TabIndex = 7;
             // 
             // webBrowser1
             // 
             this.webBrowser1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.webBrowser1.Location = new System.Drawing.Point(0, 0);
-            this.webBrowser1.MinimumSize = new System.Drawing.Size(20, 20);
+            this.webBrowser1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+            this.webBrowser1.MinimumSize = new System.Drawing.Size(37, 35);
             this.webBrowser1.Name = "webBrowser1";
-            this.webBrowser1.Size = new System.Drawing.Size(1431, 406);
+            this.webBrowser1.Size = new System.Drawing.Size(2624, 710);
             this.webBrowser1.TabIndex = 0;
-            this.webBrowser1.Url = new System.Uri("http://10.60.101.10:8003/PaintView.html", System.UriKind.Absolute);
+            this.webBrowser1.Tag = "http://10.60.101.10:8003/PaintView.html;http://localhost:8003/PaintView.html";
+            this.webBrowser1.Url = new System.Uri("", System.UriKind.Relative);
             // 
             // panel2
             // 
@@ -138,9 +144,10 @@
             this.panel2.Controls.Add(this.label5);
             this.panel2.Controls.Add(this.label4);
             this.panel2.Controls.Add(this.label3);
-            this.panel2.Location = new System.Drawing.Point(3, 502);
+            this.panel2.Location = new System.Drawing.Point(6, 878);
+            this.panel2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(1431, 401);
+            this.panel2.Size = new System.Drawing.Size(2624, 702);
             this.panel2.TabIndex = 8;
             // 
             // label22
@@ -148,9 +155,10 @@
             this.label22.BackColor = System.Drawing.Color.SteelBlue;
             this.label22.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.label22.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label22.Location = new System.Drawing.Point(1054, 24);
+            this.label22.Location = new System.Drawing.Point(1932, 42);
+            this.label22.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(191, 68);
+            this.label22.Size = new System.Drawing.Size(349, 118);
             this.label22.TabIndex = 21;
             this.label22.Text = "晚班";
             this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -160,9 +168,10 @@
             this.label21.BackColor = System.Drawing.Color.SteelBlue;
             this.label21.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.label21.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label21.Location = new System.Drawing.Point(221, 24);
+            this.label21.Location = new System.Drawing.Point(405, 42);
+            this.label21.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label21.Name = "label21";
-            this.label21.Size = new System.Drawing.Size(191, 62);
+            this.label21.Size = new System.Drawing.Size(349, 107);
             this.label21.TabIndex = 20;
             this.label21.Text = "白班";
             this.label21.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -170,9 +179,10 @@
             // button2
             // 
             this.button2.Font = new System.Drawing.Font("宋体", 27.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.button2.Location = new System.Drawing.Point(1197, 338);
+            this.button2.Location = new System.Drawing.Point(2195, 592);
+            this.button2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.button2.Name = "button2";
-            this.button2.Size = new System.Drawing.Size(183, 47);
+            this.button2.Size = new System.Drawing.Size(336, 82);
             this.button2.TabIndex = 19;
             this.button2.Text = "入库明细";
             this.button2.UseVisualStyleBackColor = true;
@@ -181,9 +191,10 @@
             // button1
             // 
             this.button1.Font = new System.Drawing.Font("宋体", 27.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.button1.Location = new System.Drawing.Point(349, 338);
+            this.button1.Location = new System.Drawing.Point(640, 592);
+            this.button1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(183, 47);
+            this.button1.Size = new System.Drawing.Size(336, 82);
             this.button1.TabIndex = 18;
             this.button1.Text = "入库明细";
             this.button1.UseVisualStyleBackColor = true;
@@ -194,9 +205,10 @@
             this.label12.BackColor = System.Drawing.Color.SteelBlue;
             this.label12.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.label12.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label12.Location = new System.Drawing.Point(1300, 243);
+            this.label12.Location = new System.Drawing.Point(2383, 425);
+            this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label12.Name = "label12";
-            this.label12.Size = new System.Drawing.Size(80, 74);
+            this.label12.Size = new System.Drawing.Size(145, 128);
             this.label12.TabIndex = 17;
             this.label12.Text = "根";
             this.label12.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -206,9 +218,10 @@
             this.label13.BackColor = System.Drawing.Color.SteelBlue;
             this.label13.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.label13.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label13.Location = new System.Drawing.Point(1300, 172);
+            this.label13.Location = new System.Drawing.Point(2383, 301);
+            this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label13.Name = "label13";
-            this.label13.Size = new System.Drawing.Size(80, 74);
+            this.label13.Size = new System.Drawing.Size(145, 128);
             this.label13.TabIndex = 16;
             this.label13.Text = "根";
             this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -218,9 +231,10 @@
             this.label14.BackColor = System.Drawing.Color.SteelBlue;
             this.label14.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.label14.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label14.Location = new System.Drawing.Point(1300, 97);
+            this.label14.Location = new System.Drawing.Point(2383, 170);
+            this.label14.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label14.Name = "label14";
-            this.label14.Size = new System.Drawing.Size(80, 74);
+            this.label14.Size = new System.Drawing.Size(145, 128);
             this.label14.TabIndex = 15;
             this.label14.Text = "根";
             this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -230,9 +244,10 @@
             this.label15.BackColor = System.Drawing.SystemColors.Control;
             this.label15.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.label15.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label15.Location = new System.Drawing.Point(1113, 243);
+            this.label15.Location = new System.Drawing.Point(2041, 425);
+            this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label15.Name = "label15";
-            this.label15.Size = new System.Drawing.Size(191, 74);
+            this.label15.Size = new System.Drawing.Size(349, 128);
             this.label15.TabIndex = 14;
             this.label15.Text = "0";
             this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -242,9 +257,10 @@
             this.label16.BackColor = System.Drawing.SystemColors.Control;
             this.label16.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.label16.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label16.Location = new System.Drawing.Point(1113, 99);
+            this.label16.Location = new System.Drawing.Point(2041, 173);
+            this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label16.Name = "label16";
-            this.label16.Size = new System.Drawing.Size(191, 74);
+            this.label16.Size = new System.Drawing.Size(349, 128);
             this.label16.TabIndex = 13;
             this.label16.Text = "0";
             this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -254,9 +270,10 @@
             this.label17.BackColor = System.Drawing.SystemColors.Control;
             this.label17.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.label17.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label17.Location = new System.Drawing.Point(1113, 170);
+            this.label17.Location = new System.Drawing.Point(2041, 298);
+            this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label17.Name = "label17";
-            this.label17.Size = new System.Drawing.Size(191, 74);
+            this.label17.Size = new System.Drawing.Size(349, 128);
             this.label17.TabIndex = 12;
             this.label17.Text = "0";
             this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -266,9 +283,10 @@
             this.label18.BackColor = System.Drawing.Color.SteelBlue;
             this.label18.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.label18.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label18.Location = new System.Drawing.Point(926, 244);
+            this.label18.Location = new System.Drawing.Point(1698, 427);
+            this.label18.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label18.Name = "label18";
-            this.label18.Size = new System.Drawing.Size(191, 74);
+            this.label18.Size = new System.Drawing.Size(349, 128);
             this.label18.TabIndex = 11;
             this.label18.Text = "小件";
             this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -278,9 +296,10 @@
             this.label19.BackColor = System.Drawing.Color.SteelBlue;
             this.label19.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.label19.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label19.Location = new System.Drawing.Point(926, 172);
+            this.label19.Location = new System.Drawing.Point(1698, 301);
+            this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label19.Name = "label19";
-            this.label19.Size = new System.Drawing.Size(191, 74);
+            this.label19.Size = new System.Drawing.Size(349, 128);
             this.label19.TabIndex = 10;
             this.label19.Text = "门槛";
             this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -290,9 +309,10 @@
             this.label20.BackColor = System.Drawing.Color.SteelBlue;
             this.label20.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.label20.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label20.Location = new System.Drawing.Point(926, 99);
+            this.label20.Location = new System.Drawing.Point(1698, 173);
+            this.label20.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label20.Name = "label20";
-            this.label20.Size = new System.Drawing.Size(191, 74);
+            this.label20.Size = new System.Drawing.Size(349, 128);
             this.label20.TabIndex = 9;
             this.label20.Text = "保险杠";
             this.label20.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -302,9 +322,10 @@
             this.label11.BackColor = System.Drawing.Color.SteelBlue;
             this.label11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.label11.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label11.Location = new System.Drawing.Point(452, 244);
+            this.label11.Location = new System.Drawing.Point(829, 427);
+            this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label11.Name = "label11";
-            this.label11.Size = new System.Drawing.Size(80, 74);
+            this.label11.Size = new System.Drawing.Size(145, 128);
             this.label11.TabIndex = 8;
             this.label11.Text = "根";
             this.label11.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -314,9 +335,10 @@
             this.label10.BackColor = System.Drawing.Color.SteelBlue;
             this.label10.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.label10.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label10.Location = new System.Drawing.Point(452, 173);
+            this.label10.Location = new System.Drawing.Point(829, 303);
+            this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(80, 74);
+            this.label10.Size = new System.Drawing.Size(145, 128);
             this.label10.TabIndex = 7;
             this.label10.Text = "根";
             this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -326,9 +348,10 @@
             this.label9.BackColor = System.Drawing.Color.SteelBlue;
             this.label9.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.label9.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label9.Location = new System.Drawing.Point(452, 101);
+            this.label9.Location = new System.Drawing.Point(829, 177);
+            this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(80, 74);
+            this.label9.Size = new System.Drawing.Size(145, 128);
             this.label9.TabIndex = 6;
             this.label9.Text = "根";
             this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -338,9 +361,10 @@
             this.label8.BackColor = System.Drawing.SystemColors.Control;
             this.label8.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.label8.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label8.Location = new System.Drawing.Point(265, 244);
+            this.label8.Location = new System.Drawing.Point(486, 427);
+            this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(191, 74);
+            this.label8.Size = new System.Drawing.Size(349, 128);
             this.label8.TabIndex = 5;
             this.label8.Text = "0";
             this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -350,9 +374,10 @@
             this.label7.BackColor = System.Drawing.SystemColors.Control;
             this.label7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.label7.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label7.Location = new System.Drawing.Point(265, 173);
+            this.label7.Location = new System.Drawing.Point(486, 303);
+            this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(191, 74);
+            this.label7.Size = new System.Drawing.Size(349, 128);
             this.label7.TabIndex = 4;
             this.label7.Text = "0";
             this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -362,9 +387,10 @@
             this.label6.BackColor = System.Drawing.SystemColors.Control;
             this.label6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.label6.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label6.Location = new System.Drawing.Point(265, 101);
+            this.label6.Location = new System.Drawing.Point(486, 177);
+            this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(191, 74);
+            this.label6.Size = new System.Drawing.Size(349, 128);
             this.label6.TabIndex = 3;
             this.label6.Text = "0";
             this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -374,9 +400,10 @@
             this.label5.BackColor = System.Drawing.Color.SteelBlue;
             this.label5.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.label5.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.Location = new System.Drawing.Point(78, 245);
+            this.label5.Location = new System.Drawing.Point(143, 429);
+            this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(191, 74);
+            this.label5.Size = new System.Drawing.Size(349, 128);
             this.label5.TabIndex = 2;
             this.label5.Text = "小件";
             this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -386,9 +413,10 @@
             this.label4.BackColor = System.Drawing.Color.SteelBlue;
             this.label4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.label4.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.Location = new System.Drawing.Point(78, 173);
+            this.label4.Location = new System.Drawing.Point(143, 303);
+            this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(191, 74);
+            this.label4.Size = new System.Drawing.Size(349, 128);
             this.label4.TabIndex = 1;
             this.label4.Text = "门槛";
             this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -398,24 +426,26 @@
             this.label3.BackColor = System.Drawing.Color.SteelBlue;
             this.label3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.label3.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(78, 101);
+            this.label3.Location = new System.Drawing.Point(143, 177);
+            this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(191, 74);
+            this.label3.Size = new System.Drawing.Size(349, 128);
             this.label3.TabIndex = 0;
             this.label3.Text = "保险杠";
             this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // Form1
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1440, 900);
+            this.ClientSize = new System.Drawing.Size(2640, 1575);
             this.Controls.Add(this.panel2);
             this.Controls.Add(this.panel1);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.pictureBox1);
             this.Controls.Add(this.label1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
             this.Name = "Form1";
             this.Text = "Form1";
             this.Load += new System.EventHandler(this.Form1_Load);
diff --git a/PaintingView/Form1.cs b/PaintingView/Form1.cs
index d2e1cef..409eabf 100644
--- a/PaintingView/Form1.cs
+++ b/PaintingView/Form1.cs
@@ -25,6 +25,7 @@ namespace PaintingView
         public Form1()
         {
             InitializeComponent();
+            this.Size = new Size(1600, 900);
         }
         System.Timers.Timer timer2 = new System.Timers.Timer();
 
@@ -147,7 +148,8 @@ namespace PaintingView
                 }
 
                 #endregion
-                
+                //webBrowser1.Url = new Uri("http://localhost:8003/PaintView.html");
+                webBrowser1.Navigate("http://10.60.101.10:8030/PaintView.html");
             }
             catch (Exception ex)
             {
diff --git a/PunchAndWeld/FrmProScreen_WheelBrow_New.cs b/PunchAndWeld/FrmProScreen_WheelBrow_New.cs
index 7ce206b..9ef17c4 100644
--- a/PunchAndWeld/FrmProScreen_WheelBrow_New.cs
+++ b/PunchAndWeld/FrmProScreen_WheelBrow_New.cs
@@ -304,12 +304,14 @@ namespace PunchAndWeld
                             headTable.Columns.Add("PartName");
                             headTable.Columns.Add("BatchNo");
                             headTable.Columns.Add("ValidityDate");
+                            headTable.Columns.Add("oneBarCode");
 
                             DataRow row = headTable.NewRow();
                             row["PartNo"] = newPartNo;
                             row["PartName"] = zcPartName;
                             row["BatchNo"] = newbatch;
                             row["ValidityDate"] = validityDate;
+                            row["oneBarCode"] = textBox2.Text.Trim();
 
                             string reportName = "";
                             if (newPartNo.Substring(0, 11) == "A2548850000" ||
@@ -398,7 +400,7 @@ namespace PunchAndWeld
 
                 #region 补打
 
-                string partNo = "", partName = "", batchNo = "", validityDate = "";
+                string partNo = "", partName = "", batchNo = "", validityDate = "",oneCode = "";
                     
                 DataTable dt = ProScreenFunc.AssemblyInfo(textBox3.Text.Trim());
                 if (dt != null && dt.Rows.Count > 0)
@@ -407,6 +409,7 @@ namespace PunchAndWeld
                     partName = dt.Rows[0]["PartName"].ToString();
                     batchNo = dt.Rows[0]["BatchNo"].ToString();
                     validityDate = dt.Rows[0]["ValidityDate"].ToString();
+                    oneCode = dt.Rows[0]["BarCode"].ToString();
                 }
 
                 Assembly1 md=new Assembly1();
@@ -433,12 +436,14 @@ namespace PunchAndWeld
                 headTable.Columns.Add("PartName");
                 headTable.Columns.Add("BatchNo");
                 headTable.Columns.Add("ValidityDate");
+                headTable.Columns.Add("oneBarCode");
 
                 DataRow row = headTable.NewRow();
                 row["PartNo"] = partNo;
                 row["PartName"] = partName;
                 row["BatchNo"] = batchNo;
                 row["ValidityDate"] = validityDate;
+                row["oneBarCode"] = oneCode;
 
                 //string reportName = partName.Contains('左') ? ConfigurationManager.AppSettings["PrinterName"] : ConfigurationManager.AppSettings["PrinterName1"];
                 string reportName = "";
diff --git a/PunchAndWeld/Program.cs b/PunchAndWeld/Program.cs
index 1477a22..5d105a9 100644
--- a/PunchAndWeld/Program.cs
+++ b/PunchAndWeld/Program.cs
@@ -45,7 +45,8 @@ namespace PunchAndWeld
                         Application.Run(new FrmProScreenS()); 
                         break;
                     case "6":   
-                        Application.Run(new FrmProScreen_WheelBrow());
+                        //Application.Run(new FrmProScreen_WheelBrow());
+                        Application.Run(new FrmProScreen_WheelBrow_New());
                         break;
                     case "7":   
                         Application.Run(new FrmInspection_WheelBrow());
diff --git a/PunchAndWeld/bin/Debug/aa.grf b/PunchAndWeld/bin/Debug/aa.grf
index 98a011f..a57e0a4 100644
--- a/PunchAndWeld/bin/Debug/aa.grf
+++ b/PunchAndWeld/bin/Debug/aa.grf
@@ -1,5 +1,5 @@
 {
-	"Version":"6.6.0.2",
+	"Version":"6.6.2.0",
 	"SharePrintSetupOptions":"[PaperOrientation]",
 	"Font":{
 		"Name":"宋体",
@@ -28,6 +28,9 @@
 		},
 		{
 			"Name":"ValidityDate"
+		},
+		{
+			"Name":"oneBarCode"
 		}
 	],
 	"ReportHeader":[
@@ -132,7 +135,7 @@
 					"Height":1.19063,
 					"BarcodeType":"QRCode",
 					"CaptionPosition":"None",
-					"Text":"[#{PartNo}#]"
+					"Text":"[#{oneBarCode}#]"
 				},
 				{
 					"Type":"MemoBox",
diff --git a/PunchAssemble/PunchAndWeld/FrmDoorSillNew.cs b/PunchAssemble/PunchAndWeld/FrmDoorSillNew.cs
index 16722bf..f6405a3 100644
--- a/PunchAssemble/PunchAndWeld/FrmDoorSillNew.cs
+++ b/PunchAssemble/PunchAndWeld/FrmDoorSillNew.cs
@@ -38,8 +38,10 @@ namespace PunchAndWeld
 
         private void FrmDoorSillNew_Load(object sender, EventArgs e)
         {
-            label5.Text = "当前版本：" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
             stationNo = ConfigurationManager.AppSettings["StationNo"].ToString();
+            string screenm = ConfigurationManager.AppSettings["ProScreenMode"].ToString();
+            label5.Text = stationNo + screenm + "版本:" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+            
             stationId = ProScreenFunc.GetStationId(stationNo);
             label1.Text = ProScreenFunc.GetStation(stationNo);
 
diff --git a/PunchAssemble/PunchAndWeld/FrmDoorSill_214.cs b/PunchAssemble/PunchAndWeld/FrmDoorSill_214.cs
index 7ec0926..03da509 100644
--- a/PunchAssemble/PunchAndWeld/FrmDoorSill_214.cs
+++ b/PunchAssemble/PunchAndWeld/FrmDoorSill_214.cs
@@ -41,8 +41,10 @@ namespace PunchAndWeld
 
         private void FrmDoorSill_214_Load(object sender, EventArgs e)
         {
-            label5.Text = "当前版本：" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
             stationNo = ConfigurationManager.AppSettings["StationNo"].ToString();
+            string screenm = ConfigurationManager.AppSettings["ProScreenMode"].ToString();
+            label5.Text = stationNo + screenm + "版本:" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
+           
             stationId = ProScreenFunc.GetStationId(stationNo);
             label10.Visible = false;
             label10.Text = "";
diff --git a/PunchAssemble/PunchAndWeld/FrmDoorSill_214_2.cs b/PunchAssemble/PunchAndWeld/FrmDoorSill_214_2.cs
index aaea9fd..0bbcd9e 100644
--- a/PunchAssemble/PunchAndWeld/FrmDoorSill_214_2.cs
+++ b/PunchAssemble/PunchAndWeld/FrmDoorSill_214_2.cs
@@ -43,8 +43,10 @@ namespace PunchAndWeld
 
         private void FrmDoorSill_214_2_Load(object sender, EventArgs e)
         {
-            label5.Text = "当前版本：" +Assembly.GetExecutingAssembly().GetName().Version ;
             stationNo = ConfigurationManager.AppSettings["StationNo"].ToString();
+            string screenm = ConfigurationManager.AppSettings["ProScreenMode"].ToString();
+            label5.Text = stationNo + screenm + "版本:" + Assembly.GetExecutingAssembly().GetName().Version ;
+            
             stationId = ProScreenFunc.GetStationId(stationNo);
 
             label1.Text = ProScreenFunc.GetStation(stationNo);
diff --git a/PunchAssemble/PunchAndWeld/FrmHybridS.cs b/PunchAssemble/PunchAndWeld/FrmHybridS.cs
index f7ba1a5..ab9712d 100644
--- a/PunchAssemble/PunchAndWeld/FrmHybridS.cs
+++ b/PunchAssemble/PunchAndWeld/FrmHybridS.cs
@@ -49,9 +49,9 @@ namespace PunchAndWeld
             //{
             //    Environment.Exit(0);
             //}
-
-            label5.Text = "当前版本：" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
             stationNo = ConfigurationManager.AppSettings["StationNo"].ToString();
+            string screenm = ConfigurationManager.AppSettings["ProScreenMode"].ToString();
+            label5.Text = stationNo + screenm + "版本:" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
             stationId = ProScreenFunc.GetStationId(stationNo);
             label1.Text = ProScreenFunc.GetStation(stationNo);
 
diff --git a/PunchAssemble/PunchAndWeld/FrmProScreen.cs b/PunchAssemble/PunchAndWeld/FrmProScreen.cs
index d538154..6b18a05 100644
--- a/PunchAssemble/PunchAndWeld/FrmProScreen.cs
+++ b/PunchAssemble/PunchAndWeld/FrmProScreen.cs
@@ -39,9 +39,9 @@ namespace PunchAndWeld
                 {
                     Environment.Exit(0);
                 }
-
-                label5.Text = "当前版本：" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
                 stationNo = ConfigurationManager.AppSettings["StationNo"].ToString();
+                string screenm = ConfigurationManager.AppSettings["ProScreenMode"].ToString();
+                label5.Text = stationNo + screenm + "版本:" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
                 stationId = ProScreenFunc.GetStationId(stationNo);
                 label1.Text = ProScreenFunc.GetStation(stationNo);
 
diff --git a/PunchAssemble/PunchAndWeld/FrmProScreenBumper.cs b/PunchAssemble/PunchAndWeld/FrmProScreenBumper.cs
index 6dc951b..17cf336 100644
--- a/PunchAssemble/PunchAndWeld/FrmProScreenBumper.cs
+++ b/PunchAssemble/PunchAndWeld/FrmProScreenBumper.cs
@@ -34,6 +34,9 @@ namespace PunchAndWeld
         private void FrmProScreenBumper_Load(object sender, EventArgs e)
         {
             stationNo = ConfigurationManager.AppSettings["StationNo"].ToString();
+            //string screenm = ConfigurationManager.AppSettings["ProScreenMode"].ToString();
+            //label5.Text = stationNo + screenm + "版本:" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
+
             label1.Text = ProScreenFunc.GetStation(stationNo);
             stationId = ProScreenFunc.GetStationId(stationNo);
             Control.CheckForIllegalCrossThreadCalls = false;
diff --git a/PunchAssemble/PunchAndWeld/FrmProScreenS.cs b/PunchAssemble/PunchAndWeld/FrmProScreenS.cs
index 9bc445b..e0b864a 100644
--- a/PunchAssemble/PunchAndWeld/FrmProScreenS.cs
+++ b/PunchAssemble/PunchAndWeld/FrmProScreenS.cs
@@ -4,6 +4,7 @@ using System.ComponentModel;
 using System.Configuration;
 using System.Data;
 using System.Data.SqlClient;
+using System.Diagnostics;
 using System.Drawing;
 using System.Linq;
 using System.Reflection;
@@ -39,9 +40,10 @@ namespace PunchAndWeld
                 {
                     Environment.Exit(0);
                 }
-
-                label5.Text = "当前版本：" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
                 stationNo = ConfigurationManager.AppSettings["StationNo"].ToString();
+                string screenm = ConfigurationManager.AppSettings["ProScreenMode"].ToString(); 
+                label5.Text = stationNo+ screenm + "版本:" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
+               
                 stationId = ProScreenFunc.GetStationId(stationNo);
                 label1.Text = ProScreenFunc.GetStation(stationNo);
 
@@ -185,6 +187,7 @@ namespace PunchAndWeld
 
                 try
                 {
+                    LogSysBLL.AddInfo("工位" + stationNo + "扫码" + oneBarCode + "视觉检测接收时间:" + DateTime.Now.ToLongTimeString(), MethodBase.GetCurrentMethod());
                     LogHelper.WriteSysLogBase("条码号：" + barcode + "工位：" + label1.Text.Trim() + "，一码到底调用WMS接口",
                         MethodBase.GetCurrentMethod().Name);
 
@@ -206,6 +209,7 @@ namespace PunchAndWeld
 
                         ProScreenFunc.AddCompleteCount(this.Tag.ToString().Trim());
 
+                        LogSysBLL.AddInfo("工位" + stationNo + "扫码" + oneBarCode + "视觉检测接收后处理完成时间:" + DateTime.Now.ToLongTimeString(), MethodBase.GetCurrentMethod());
 
                         try
                         {
@@ -587,7 +591,9 @@ namespace PunchAndWeld
 
                 oneBarCode = barcode;
             }
-
+            LogSysBLL.AddInfo("工位" + stationNo + "扫码" + oneBarCode + "开始时间:" + DateTime.Now.ToLongTimeString(), MethodBase.GetCurrentMethod());
+            Stopwatch sw = new Stopwatch();
+            sw.Start();
             //验证设备点检
             if (ConfigurationManager.AppSettings["IsDeviceCheck"]?.ToString()?.Trim().ToLower() == "true")
             {
@@ -683,7 +689,8 @@ namespace PunchAndWeld
             {
                 ScanBarcode(barcode);
             }
-
+            sw.Stop();
+            LogSysBLL.AddInfo("工位" + stationNo + "扫码" + oneBarCode + "耗时:" + sw.ElapsedMilliseconds, MethodBase.GetCurrentMethod());
         }
 
         private void ScanBarcode(string barcode)
@@ -832,7 +839,7 @@ namespace PunchAndWeld
 
         private void button2_Click(object sender, EventArgs e)
         {
-            if (this.Tag.ToString() == "")
+            if (this.Tag==null || this.Tag.ToString() == "")
             {
                 MessageBox.Show("无下一计划！", "提示");
             }
diff --git a/PunchAssemble/PunchAndWeld/FrmProScreen_WheelBrow.cs b/PunchAssemble/PunchAndWeld/FrmProScreen_WheelBrow.cs
index 8e73859..c3fb029 100644
--- a/PunchAssemble/PunchAndWeld/FrmProScreen_WheelBrow.cs
+++ b/PunchAssemble/PunchAndWeld/FrmProScreen_WheelBrow.cs
@@ -38,9 +38,10 @@ namespace PunchAndWeld
                 {
                     Environment.Exit(0);
                 }
-
-                label5.Text = "当前版本：" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
                 stationNo = ConfigurationManager.AppSettings["StationNo"].ToString();
+                string screenm = ConfigurationManager.AppSettings["ProScreenMode"].ToString();
+                label5.Text = stationNo + screenm + "版本:" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
+                
                 stationId = ProScreenFunc.GetStationId(stationNo);
                 label1.Text = ProScreenFunc.GetStation(stationNo);
 
diff --git a/PunchAssemble/PunchAndWeld/Program.cs b/PunchAssemble/PunchAndWeld/Program.cs
index b2c728c..8a40807 100644
--- a/PunchAssemble/PunchAndWeld/Program.cs
+++ b/PunchAssemble/PunchAndWeld/Program.cs
@@ -29,7 +29,7 @@ namespace PunchAndWeld
                 switch (aa)
                 {
                     case "1":
-                        Application.Run(new FrmProScreen()); 
+                        Application.Run(new FrmProScreen()); //有视觉
                         break;
                     case "2":
                         Application.Run(new FrmProScreenBumper());//PLC
@@ -42,10 +42,10 @@ namespace PunchAndWeld
                         break;
 
                     case "5":
-                        Application.Run(new FrmProScreenS()); 
+                        Application.Run(new FrmProScreenS()); //有视觉
                         break;
                     case "6":   
-                        Application.Run(new FrmProScreen_WheelBrow());
+                        Application.Run(new FrmProScreen_WheelBrow());//有视觉
                         break;
                     case "7":   
                         Application.Run(new FrmInspection_WheelBrow());//
@@ -54,7 +54,7 @@ namespace PunchAndWeld
                         Application.Run(new FrmLaser());//PLC
                         break;
                     case "9":   
-                        Application.Run(new FrmDoorSill());
+                        Application.Run(new FrmDoorSill());//有视觉
                         break;
                     case "10":   
                         Application.Run(new FrmPrintOrder());//
@@ -63,13 +63,13 @@ namespace PunchAndWeld
                         Application.Run(new FrmPreNoPlan());
                         break;
                     case "12":   
-                        Application.Run(new FrmDoorSillNew());
+                        Application.Run(new FrmDoorSillNew());//有视觉
                         break;
                     case "13":   
-                        Application.Run(new FrmDoorSill_214());
+                        Application.Run(new FrmDoorSill_214());//有视觉
                         break;
                     case "14":   
-                        Application.Run(new FrmDoorSill_214_2());//PLC
+                        Application.Run(new FrmDoorSill_214_2());//PLC 
                         break;
                     case "15": //214门槛冲孔 分高低配和左右侧. 
                         Application.Run(new FrmDoorSill_214_3());//PLC
diff --git a/PunchAssemble/PunchAndWeld/Properties/AssemblyInfo.cs b/PunchAssemble/PunchAndWeld/Properties/AssemblyInfo.cs
index 916d845..f814159 100644
--- a/PunchAssemble/PunchAndWeld/Properties/AssemblyInfo.cs
+++ b/PunchAssemble/PunchAndWeld/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@ using System.Runtime.InteropServices;
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.23")]
-[assembly: AssemblyFileVersion("1.0.0.23")]
+[assembly: AssemblyVersion("1.0.0.24")]
+[assembly: AssemblyFileVersion("1.0.0.24")]
 //1.0.0.23 扫塑件码增加了,StockIn验证
diff --git a/PurchingMistakeNew/Form1.cs b/PurchingMistakeNew/Form1.cs
index 7ce9547..4ab5576 100644
--- a/PurchingMistakeNew/Form1.cs
+++ b/PurchingMistakeNew/Form1.cs
@@ -49,253 +49,6 @@ namespace PurchingMistakeNew
                 {
                     if (textBox1.Text.Trim() != "")
                     {
-                        #region 查找配置码对应的总成、标准包装量
-
-                        //DataTable dt = bll.SearchPartNoByDecice(textBox1.Text.Trim());
-                        //if (dt != null && dt.Rows.Count > 0)
-                        //{
-                        //    partno = dt.Rows[0]["PartNo2"].ToString();
-                        //    packCount =Convert.ToInt32(dt.Rows[0]["PackCount"].ToString());
-                        //    PartName = dt.Rows[0]["PartName2"].ToString();
-                        //}
-
-                        //#endregion
-
-                        //#region 当前箱单是哪个
-
-                        //DataTable boxdt = bbll.searchBox(partno);
-                        //if (boxdt != null && boxdt.Rows.Count > 0)
-                        //{
-                        //    BoxNo = boxdt.Rows[0]["BoxNo"].ToString();
-                        //    banBatchNo = boxdt.Rows[0]["BatchNo"].ToString();
-                        //    newBatchNo = DateTime.Now.ToString("yyyy-MM-dd").Substring(2, 2) +
-                        //                 DateTime.Now.ToString("yyyy-MM-dd").Substring(5, 2) +
-                        //                 DateTime.Now.ToString("yyyy-MM-dd").Substring(8, 2);
-
-                            
-                        //    #region 判断箱单是否已满
-
-                        //    DataTable rdt = rbll.SearchCountByBox(BoxNo);
-                        //    if (rdt != null && rdt.Rows.Count > 0)
-                        //    {
-                        //        if (Convert.ToInt32(rdt.Rows[0]["sum"].ToString()) == packCount)
-                        //        {
-                        //            #region 生成包装单
-
-                        //            if (banBatchNo == newBatchNo)
-                        //            {
-                        //                newBoxNo = partno + "." + banBatchNo + "." +
-                        //                           (Convert.ToInt32(BoxNo.Substring(BoxNo.Length - 4, 4)) + 1)
-                        //                           .ToString()
-                        //                           .PadLeft(4, '0');
-                        //            }
-                        //            else
-                        //            {
-                        //                newBoxNo = partno + "." + newBatchNo + "." +"0001";
-                        //            }
-
-                        //            #endregion
-
-                        //            bmd.ID = Guid.NewGuid().ToString();
-                        //            bmd.BoxNo = newBoxNo;
-                        //            bmd.PartNo = partno;
-                        //            bmd.PartName = PartName;
-                        //            bmd.BatchNo = newBatchNo;
-
-                        //            bbll.AddInfo(bmd);
-
-
-                        //            #region 打印装箱单
-
-                        //            if (partno == "A2477209103" || partno == "A2477209203" || partno == "A2477209305" || partno == "A2477203007" || partno == "A2477203207" || partno == "A2477205006")
-                        //            {
-                        //                report.LoadFromFile(@"D:\X247 左侧前门板装箱单.grf");
-                        //                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                        //            }
-
-
-                        //            if (partno == "A2477309401" || partno == "A2477309501" || partno == "A2477300203" || partno == "A2477305303" || partno == "A2477305503" || partno == "A2477305703")
-                        //            {
-                        //                report.LoadFromFile(@"D:\X247 左侧后门板装箱单.grf");
-                        //                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                        //            }
-
-                        //            if (partno == "A2477209303" || partno == "A2477209403" || partno == "A2477207505" || partno == "A2477203107" || partno == "A2477203307" || partno == "A2477205106")
-                        //            {
-                        //                report.LoadFromFile(@"D:\X247 右侧前门板装箱单.grf");
-                        //                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                        //            }
-
-                        //            if (partno == "A2477309601" || partno == "A2477309701" || partno == "A2477300303" || partno == "A2477305403" || partno == "A2477305603" || partno == "A2477305803")
-                        //            {
-                        //                report.LoadFromFile(@"D:\X247 右侧后门板装箱单.grf");
-                        //                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                        //            }
-
-                        //            if (partno == "A2478850022")
-                        //            {
-                        //                report.LoadFromFile(@"D:\X247 前部左侧轮眉装箱单.grf");
-                        //                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                        //            }
-
-                        //            if (partno == "A2478850222")
-                        //            {
-                        //                report.LoadFromFile(@"D:\X247 后部左侧轮眉装箱单.grf");
-                        //                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                        //            }
-
-                        //            if (partno == "A2478850122")
-                        //            {
-                        //                report.LoadFromFile(@"D:\X247 前部右侧轮眉装箱单.grf");
-                        //                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                        //            }
-
-                        //            if (partno == "A2478850322")
-                        //            {
-                        //                report.LoadFromFile(@"D:\X247 后部右侧后轮眉装箱单.grf");
-                        //                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                        //            }
-
-                        //            if (partno == "A2477309400")
-                        //            {
-                        //                report.LoadFromFile(@"D:\X247 后部左侧前轮眉装箱单.grf");
-                        //                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                        //            }
-
-                        //            if (partno == "A2477309600")
-                        //            {
-                        //                report.LoadFromFile(@"D:\X247 后部右侧前轮眉装箱单.grf");
-                        //                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                        //            }
-
-                        //            if (partno == "A2477900788" || partno == "A2477901300")
-                        //            {
-                        //                report.LoadFromFile(@"D:\X247 后部左侧扰流板装箱单.grf");
-                        //                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                        //            }
-
-                        //            if (partno == "A2477900888" || partno == "A2477901400")
-                        //            {
-                        //                report.LoadFromFile(@"D:\X247 后部右侧扰流板装箱单.grf");
-                        //                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                        //            }
-
-                        //            #endregion
-
-                        //            report.Register("");
-                        //            report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
-                        //            report.Print(false);
-                        //            bbll.UpdateInfo(bmd);
-
-                        //        }
-                        //    }
-
-                        //    #endregion
-                        //}
-                        //else
-                        //{
-                        //    #region 生成包装单
-
-                        //    newBatchNo = DateTime.Now.ToString("yyyy-MM-dd").Substring(2, 2) +
-                        //                 DateTime.Now.ToString("yyyy-MM-dd").Substring(5, 2) +
-                        //                 DateTime.Now.ToString("yyyy-MM-dd").Substring(8, 2);
-                        //    BoxNo = partno + "." + newBatchNo + "." + "0001";
-
-                        //    #endregion
-
-                        //    bmd.ID = Guid.NewGuid().ToString();
-                        //    bmd.BoxNo = BoxNo;
-                        //    bmd.PartNo = partno;
-                        //    bmd.PartName = PartName;
-                        //    bmd.BatchNo = newBatchNo;
-                        //    bbll.AddInfo(bmd);
-
-                        //    #region 打印装箱单
-
-                        //    if (partno == "A2477209103" || partno == "A2477209203" || partno == "A2477209305" || partno == "A2477203007" || partno == "A2477203207" || partno == "A2477205006")
-                        //    {
-                        //        report.LoadFromFile(@"D:\X247 左侧前门板装箱单.grf");
-                        //        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                        //    }
-
-
-                        //    if (partno == "A2477309401" || partno == "A2477309501" || partno == "A2477300203" || partno == "A2477305303" || partno == "A2477305503" || partno == "A2477305703")
-                        //    {
-                        //        report.LoadFromFile(@"D:\X247 左侧后门板装箱单.grf");
-                        //        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                        //    }
-
-                        //    if (partno == "A2477209303" || partno == "A2477209403" || partno == "A2477207505" || partno == "A2477203107" || partno == "A2477203307" || partno == "A2477205106")
-                        //    {
-                        //        report.LoadFromFile(@"D:\X247 右侧前门板装箱单.grf");
-                        //        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                        //    }
-
-                        //    if (partno == "A2477309601" || partno == "A2477309701" || partno == "A2477300303" || partno == "A2477305403" || partno == "A2477305603" || partno == "A2477305803")
-                        //    {
-                        //        report.LoadFromFile(@"D:\X247 右侧后门板装箱单.grf");
-                        //        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                        //    }
-
-                        //    if (partno == "A2478850022")
-                        //    {
-                        //        report.LoadFromFile(@"D:\X247 前部左侧轮眉装箱单.grf");
-                        //        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                        //    }
-
-                        //    if (partno == "A2478850222")
-                        //    {
-                        //        report.LoadFromFile(@"D:\X247 后部左侧轮眉装箱单.grf");
-                        //        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                        //    }
-
-                        //    if (partno == "A2478850122")
-                        //    {
-                        //        report.LoadFromFile(@"D:\X247 前部右侧轮眉装箱单.grf");
-                        //        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                        //    }
-
-                        //    if (partno == "A2478850322")
-                        //    {
-                        //        report.LoadFromFile(@"D:\X247 后部右侧后轮眉装箱单.grf");
-                        //        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                        //    }
-
-                        //    if (partno == "A2477309400")
-                        //    {
-                        //        report.LoadFromFile(@"D:\X247 后部左侧前轮眉装箱单.grf");
-                        //        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                        //    }
-
-                        //    if (partno == "A2477309600")
-                        //    {
-                        //        report.LoadFromFile(@"D:\X247 后部右侧前轮眉装箱单.grf");
-                        //        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                        //    }
-
-                        //    if (partno == "A2477900788" || partno == "A2477901300")
-                        //    {
-                        //        report.LoadFromFile(@"D:\X247 后部左侧扰流板装箱单.grf");
-                        //        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                        //    }
-
-                        //    if (partno == "A2477900888" || partno == "A2477901400")
-                        //    {
-                        //        report.LoadFromFile(@"D:\X247 后部右侧扰流板装箱单.grf");
-                        //        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                        //    }
-
-                        //    #endregion
-
-                        //    report.Register("");
-                        //    report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
-                        //    report.Print(false);
-                        //    bbll.UpdateInfo(bmd);
-                        //}
-
-                        
-                        #endregion
-
                         textBox2.Enabled = true;
                         textBox2.Focus();
                     }
@@ -580,10 +333,7 @@ namespace PurchingMistakeNew
                                 {
                                     md.PartType = "X247 左侧前门板";
                                     type = 1;
-                                    fileName = ReportHelper.GetTemplateName("X247门板");
-                                    report.LoadFromFile(fileName); // @"D:\New\X247 左侧前门板.grf" ;
-
-                                    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                                   UtilityHelper. SetPrintInfo(ref fileName, "门板", report, "Printer1");
                                     GetHeadTable = _recordBLL.GetX247LF;
                                 }
 
@@ -591,9 +341,8 @@ namespace PurchingMistakeNew
                                 {
                                     md.PartType = "X247 左侧后门板";
                                     type = 1;
-                                    fileName = ReportHelper.GetTemplateName("X247门板");
-                                    report.LoadFromFile(fileName);
-                                    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                                    //SetPrintInfo(ref fileName, "门板", report, "Printer2", _recordBLL.GetX247LR);
+                                    UtilityHelper.SetPrintInfo(ref fileName, "门板", report, "Printer2");
                                     GetHeadTable = _recordBLL.GetX247LR;
                                 }
 
@@ -601,11 +350,8 @@ namespace PurchingMistakeNew
                                 {
                                     md.PartType = "X247 右侧前门板";
                                     type = 2;
-
-                                    fileName = ReportHelper.GetTemplateName("X247门板");
-                                    report.LoadFromFile(fileName);
-
-                                    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                                    //SetPrintInfo(ref fileName, "门板", report, "Printer1", _recordBLL.GetX247RF);
+                                    UtilityHelper.SetPrintInfo(ref fileName, "门板", report, "Printer1");
                                     GetHeadTable = _recordBLL.GetX247RF;
                                 }
 
@@ -613,11 +359,8 @@ namespace PurchingMistakeNew
                                 {
                                     md.PartType = "X247 右侧后门板";
                                     type = 2;
-                                    fileName = ReportHelper.GetTemplateName("X247门板");
-                                    report.LoadFromFile(fileName);
-
-                                    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                                   
+                                    //SetPrintInfo(ref fileName, "门板", report, "Printer2", _recordBLL.GetX247RR);
+                                    UtilityHelper.SetPrintInfo(ref fileName, "门板", report, "Printer2");
                                     GetHeadTable = _recordBLL.GetX247RR;
                                 }
 
@@ -625,81 +368,75 @@ namespace PurchingMistakeNew
                                 {
                                     md.PartType = "X247 前部左侧轮眉";
                                     type = 3;
-                                    report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 前部左侧轮眉"));
-
-                                    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                                    //SetPrintInfo(ref fileName, "轮眉", report, "Printer1", _recordBLL.GetLMX247LF);
+                                    UtilityHelper.SetPrintInfo(ref fileName, "轮眉247", report, "Printer1");
+                                    GetHeadTable = _recordBLL.GetLMX247LF;
                                 }
 
                                 if (partNo == "1230002615")
                                 {
                                     md.PartType = "X247 后部左侧后轮眉";
                                     type = 3;
-                                    report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 后部左侧后轮眉"));
-
-                                    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                                    //SetPrintInfo(ref fileName, "轮眉", report, "Printer1", _recordBLL.GetLMX247LH);
+                                    UtilityHelper.SetPrintInfo(ref fileName, "轮眉247", report, "Printer1");
+                                    GetHeadTable = _recordBLL.GetLMX247LH;
                                 }
 
                                 if (partNo == "1230002612")
                                 {
                                     md.PartType = "X247 前部右侧轮眉";
                                     type = 4;
-                                    report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 前部右侧轮眉"));
-
-                                    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                                    //SetPrintInfo(ref fileName, "轮眉", report, "Printer2", _recordBLL.GetLMX247FR);
+                                    UtilityHelper.SetPrintInfo(ref fileName, "轮眉247", report, "Printer2");
+                                    GetHeadTable = _recordBLL.GetLMX247FR;
                                 }
 
                                 if (partNo == "1230002617")
                                 {
                                     md.PartType = "X247 右侧后部后轮眉";
                                     type = 4;
-
-                                    report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 右侧后部后轮眉"));
-
-                                    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                                    //SetPrintInfo(ref fileName, "轮眉", report, "Printer2", _recordBLL.GetLMX247RHH);
+                                    UtilityHelper.SetPrintInfo(ref fileName, "轮眉247", report, "Printer2");
+                                    GetHeadTable = _recordBLL.GetLMX247RHH;
                                 }
 
                                 if (partNo == "1230002619")
                                 {
                                     md.PartType = "X247 后部左侧前轮眉";
-
                                     type = 5;
-                                    report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 后部左侧前轮眉"));
-
-                                    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                                    //SetPrintInfo(ref fileName, "轮眉", report, "Printer1", _recordBLL.GetLMX247HLF);
+                                    UtilityHelper.SetPrintInfo(ref fileName, "轮眉247", report, "Printer1");
+                                    GetHeadTable = _recordBLL.GetLMX247HLF;
                                 }
 
                                 if (partNo == "1230002621")
                                 {
                                     md.PartType = "X247 后部右侧前轮眉";
-
                                     type = 5;
+                                    //SetPrintInfo(ref fileName, "轮眉", report, "Printer1", _recordBLL.GetLMX247HRF);
+                                    UtilityHelper.SetPrintInfo(ref fileName, "轮眉247", report, "Printer1");
+                                    GetHeadTable = _recordBLL.GetLMX247HRF;
 
-                                    report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 后部右侧前轮眉"));
-
-                                    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
                                 }
 
                                 if (partNo == "1230002627")
                                 {
                                     md.PartType = "X247 后部左侧扰流板";
-
                                     type = 6;
-
-                                    report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 后部左侧扰流板"));
-
-                                    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                                    //SetPrintInfo(ref fileName, "扰流板", report, "Printer1", _recordBLL.GetX247SpoilerHL);
+                                    UtilityHelper.SetPrintInfo(ref fileName, "扰流板", report, "Printer1");
+                                    GetHeadTable = _recordBLL.GetX247SpoilerHL;
                                 }
 
                                 if (partNo == "1230002600")
                                 {
                                     md.PartType = "X247 后部右侧扰流板";
-
                                     type = 7;
-
-                                    report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 后部右侧扰流板"));
-
-                                    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                                    //SetPrintInfo(ref fileName, "扰流板", report, "Printer1", _recordBLL.GetX247SpoilerHR);
+                                    UtilityHelper.SetPrintInfo(ref fileName, "扰流板", report, "Printer1");
+                                    GetHeadTable = _recordBLL.GetX247SpoilerHR;
                                 }
+
                                 #endregion
 
                                 md.Color = "通用";
@@ -715,29 +452,9 @@ namespace PurchingMistakeNew
                                 #endregion
 
                                 #region 打印总成条码
-                              
-
-                                if (string.IsNullOrEmpty(fileName))
-                                {
-                                    report.Register("");
-                                    report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
-                                    report.Print(false);
-                                   
-                                }
-                                else
-                                {
-                                    headTable = GetHeadTable();
-                                    headTable.Columns.Add("QLevel");
-                                    foreach(DataRow dr in headTable.Rows)
-                                    {
-                                        string qlevel = _recordBLL.SearchQLevelFromWms(partNo,"");
-                                        dr["QLevel"] = qlevel;
-                                    }
 
-                                    ReportHelper report2 = new ReportHelper(fileName, headTable, null, (int)GRPaperOrientation.grpoPortrait, 1, report.Printer.PrinterName);
-                                    report2.Report.Printer.PrinterName = report.Printer.PrinterName;
-                                    report2.Report.Print(false);
-                                }
+                                //Print(report, fileName, partNo, GetHeadTable());
+                                UtilityHelper.Print(report, fileName, partNo, GetHeadTable());
                                 abll.UpdateInfo(md);
 
                                 #endregion
@@ -799,6 +516,52 @@ namespace PurchingMistakeNew
                 MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK);
             }
         }
+        //void SetPrintInfo(ref string fileName, string printType, GridppReport report,string printerName,Func<DataTable> getData)
+        //{
+        //    if(printType == "门板")
+        //    {
+        //        fileName = ReportHelper.GetTemplateDoor();
+        //    }
+        //    else if (printType == "轮眉")
+        //    {
+        //        fileName = ReportHelper.GetTemplateWheelBrow();
+        //    }
+        //    else if (printType == "扰流板")
+        //    {
+        //        fileName = ReportHelper.GetTemplateSpoiler();
+        //    }
+
+        //    report.LoadFromFile(fileName);
+        //    report.Printer.PrinterName = ConfigurationManager.AppSettings[printerName].ToString();
+        //    GetHeadTable = getData;
+        //}
+
+        void Print(GridppReport report, string fileName, string part, DataTable assembleTable)
+        {
+            DataTable headTable = null;
+            if (string.IsNullOrEmpty(fileName))
+            {
+                report.Register("");
+                report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
+                report.Print(false);
+            }
+            else
+            {
+                headTable = assembleTable;
+                headTable.Columns.Add("QLevel");
+                foreach (DataRow dr in headTable.Rows)
+                {
+                    string qlevel = _recordBLL.SearchQLevelFromWms("", part);
+                    dr["QLevel"] = qlevel;
+                }
+
+                ReportHelper report2 = new ReportHelper(fileName, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, report.Printer.PrinterName);
+                report2.Report.Printer.PrinterName = report.Printer.PrinterName;
+                report2.Report.Print(false);
+            }
+        }
+
+
 
         private void timer1_Tick(object sender, EventArgs e)
         {
@@ -842,40 +605,63 @@ namespace PurchingMistakeNew
                     bll.AddInfo(md);
 
                     part = textBox3.Text.Trim().Substring(0, textBox3.Text.Trim().IndexOf("."));
-
+                    string fileName = string.Empty;
                     if (part == "A2477203007" || part == "A2477203207" || part == "A2477205006")
                     {
                         md.PartType = "X247 左侧前门板";
-                        report.LoadFromFile(ReportHelper.GetTemplateName("X247左侧前门板"));
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                        ////report.LoadFromFile(ReportHelper.GetTemplateName("X247左侧前门板"));
+                        //report.LoadFromFile(ReportHelper.GetTemplateDoor()); 
+                        //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+
+                        //SetPrintInfo(ref fileName, "门板", report, "Printer1", null);
+                        UtilityHelper.SetPrintInfo(ref fileName, "门板", report, "Printer1");
+                       
                     }
 
-                    if (part == "A2477305303" || part == "A2477305503" || part == "A2477305703")
+                   
+
+
+                if (part == "A2477305303" || part == "A2477305503" || part == "A2477305703")
                     {
                         md.PartType = "X247 左侧后门板";
-                        report.LoadFromFile(ReportHelper.GetTemplateName("X247左侧后门板"));
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                        ////report.LoadFromFile(ReportHelper.GetTemplateName("X247左侧后门板"));
+                        //report.LoadFromFile(ReportHelper.GetTemplateDoor());
+                        //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                        
+                        //SetPrintInfo(ref fileName, "门板", report, "Printer2", null);
+                        UtilityHelper.SetPrintInfo(ref fileName, "门板", report, "Printer2");
                     }
 
                     if (part == "A2477203107" || part == "A2477203307" || part == "A2477205106")
                     {
                         md.PartType = "X247 右侧前门板";
-                        report.LoadFromFile(ReportHelper.GetTemplateName("X247右侧前门板"));
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                        ////report.LoadFromFile(ReportHelper.GetTemplateName("X247右侧前门板"));
+                        //report.LoadFromFile(ReportHelper.GetTemplateDoor());
+                        //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+
+                        //SetPrintInfo(ref fileName, "门板", report, "Printer1", null);
+                        UtilityHelper.SetPrintInfo(ref fileName, "门板", report, "Printer1");
                     }
 
                     if (part == "A2477305403" || part == "A2477305603" || part == "A2477305803")
                     {
                         md.PartType = "X247 右侧后门板";
-                        report.LoadFromFile(ReportHelper.GetTemplateName("X247右侧后门板"));
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                        ////report.LoadFromFile(ReportHelper.GetTemplateName("X247右侧后门板"));
+                        //report.LoadFromFile(ReportHelper.GetTemplateDoor());
+                        //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+
+                        //SetPrintInfo(ref fileName, "门板", report, "Printer2", null);
+                        UtilityHelper.SetPrintInfo(ref fileName, "门板", report, "Printer2");
                     }
 
                     #endregion
-
-                    report.Register("");
-                    report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
-                    report.Print(false);
+                   
+                    //Print(report, fileName, md.PartNo, dt);
+                    UtilityHelper.Print(report, fileName, md.PartNo, dt);
+                   
+                    //report.Register("");
+                    //report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
+                    //report.Print(false);
                     bll.UpdateInfo(md);
 
                     
diff --git a/PurchingMistakeNew/Form3.cs b/PurchingMistakeNew/Form3.cs
index 3fa6b52..e2e6fd4 100644
--- a/PurchingMistakeNew/Form3.cs
+++ b/PurchingMistakeNew/Form3.cs
@@ -477,114 +477,139 @@ namespace PurchingMistakeNew
 
                             bll.AddInfo(md);
 
-                           
+
                             #region 打印装箱单
+                            string moudleType = string.Empty;//例如 后左
+                            string partType = string.Empty;//例如 门板,轮眉
+                            string carType = string.Empty; //车型 X247  H247等
+                            SetPrintInfo(part, report, ref fileName  ,ref moudleType,ref partType,ref carType);
 
-                            if (part == "A2477209103" || part == "A2477209203" || part == "A2477209305" || part == "A2477203007" || part == "A2477203207" || part == "A2477205006")
-                            {
-                                //report.LoadFromFile(ReportHelper.GetTemplateName("X247左侧前门板装箱单"));//@"D:\New\X247 左侧前门板装箱单.grf"
-                               
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                                fileName = ReportHelper.GetTemplateName("X247装箱单");
-                                GetHeadTable = _boxBll.GetX247LF;
-                            }
+                            #region 以前的
+                            //if (part == "A2477209103" || part == "A2477209203" || part == "A2477209305" || part == "A2477203007" || part == "A2477203207" || part == "A2477205006")
+                            //{
+                            //    ////report.LoadFromFile(ReportHelper.GetTemplateName("X247左侧前门板装箱单"));//@"D:\New\X247 左侧前门板装箱单.grf"
+                            //    //report.LoadFromFile(ReportHelper.GetBoxTemplateNameBig());
+                            //    //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                            //    ////fileName = ReportHelper.GetTemplateName("X247装箱单");
+                            //    //fileName = ReportHelper.GetBoxTemplateNameBig();
+                            //    //GetHeadTable = _boxBll.GetX247LF;
+
+                            //    SetBoxPrintInfo(ref fileName, "门板", report, "Printer1", _boxBll.GetX247LF_MB);
+                            //}
 
 
-                            if (part == "A2477309401" || part == "A2477309501" || part == "A2477300203" || part == "A2477305303" || part == "A2477305503" || part == "A2477305703")
-                            {
-                                //report.LoadFromFile(ReportHelper.GetTemplateName("X247左侧后门板装箱单"));//@"D:\New\X247 左侧后门板装箱单.grf"
-                                fileName = ReportHelper.GetTemplateName("X247装箱单");
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                                GetHeadTable = _boxBll.GetX247LR;
-                            }
+                            //if (part == "A2477309401" || part == "A2477309501" || part == "A2477300203" || part == "A2477305303" || part == "A2477305503" || part == "A2477305703")
+                            //{
+                            //    ////report.LoadFromFile(ReportHelper.GetTemplateName("X247左侧后门板装箱单"));//@"D:\New\X247 左侧后门板装箱单.grf"
+                            //    ////fileName = ReportHelper.GetTemplateName("X247装箱单");
+                            //    //report.LoadFromFile(ReportHelper.GetBoxTemplateNameBig());
+                            //    //fileName = ReportHelper.GetBoxTemplateNameBig();
+                            //    //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                            //    //GetHeadTable = _boxBll.GetX247LR;
+
+                            //    SetBoxPrintInfo(ref fileName, "门板", report, "Printer1", _boxBll.GetX247LR_MB);
+                            //}
 
-                            if (part == "A2477209303" || part == "A2477209403" || part == "A2477207505" || part == "A2477203107" || part == "A2477203307" || part == "A2477205106")
-                            {
-                                //report.LoadFromFile(ReportHelper.GetTemplateName("X247右侧前门板装箱单"));//@"D:\New\X247 右侧前门板装箱单.grf"
-                                fileName = ReportHelper.GetTemplateName("X247装箱单");
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                                GetHeadTable = _boxBll.GetX247RF;
-                            }
+                            //if (part == "A2477209303" || part == "A2477209403" || part == "A2477207505" || part == "A2477203107" || part == "A2477203307" || part == "A2477205106")
+                            //{
+                            //    ////report.LoadFromFile(ReportHelper.GetTemplateName("X247右侧前门板装箱单"));//@"D:\New\X247 右侧前门板装箱单.grf"
+                            //    ////fileName = ReportHelper.GetTemplateName("X247装箱单");
+                            //    //report.LoadFromFile(ReportHelper.GetBoxTemplateNameBig());
+                            //    //fileName = ReportHelper.GetBoxTemplateNameBig();
+                            //    //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                            //    //GetHeadTable = _boxBll.GetX247RF;
+
+                            //    SetBoxPrintInfo(ref fileName, "门板", report, "Printer2", _boxBll.GetX247RF_MB);
+                            //}
 
-                            if (part == "A2477309601" || part == "A2477309701" || part == "A2477300303" || part == "A2477305403" || part == "A2477305603" || part == "A2477305803")
-                            {
-                                //report.LoadFromFile(ReportHelper.GetTemplateName("X247右侧后门板装箱单"));//@"D:\New\X247 右侧后门板装箱单.grf"
-                                fileName = ReportHelper.GetTemplateName("X247装箱单");
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                                GetHeadTable = _boxBll.GetX247RR;
-                            }
+                            //if (part == "A2477309601" || part == "A2477309701" || part == "A2477300303" || part == "A2477305403" || part == "A2477305603" || part == "A2477305803")
+                            //{
+                            //    ////report.LoadFromFile(ReportHelper.GetTemplateName("X247右侧后门板装箱单"));//@"D:\New\X247 右侧后门板装箱单.grf"
+                            //    ////fileName = ReportHelper.GetTemplateName("X247装箱单");
+                            //    //report.LoadFromFile(ReportHelper.GetBoxTemplateNameBig());
+                            //    //fileName = ReportHelper.GetBoxTemplateNameBig();
+                            //    //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                            //    //GetHeadTable = _boxBll.GetX247RR;
+
+                            //    SetBoxPrintInfo(ref fileName, "门板", report, "Printer2", _boxBll.GetX247RR_MB);
+                            //}
 
-                            if (part == "A2478850022")
-                            {
-                                report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 前部左侧轮眉装箱单"));//@"D:\New\X247 前部左侧轮眉装箱单.grf"
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                            }
+                            //if (part == "A2478850022")
+                            //{
+                            //    ////report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 前部左侧轮眉装箱单"));//@"D:\New\X247 前部左侧轮眉装箱单.grf"
+                            //    //report.LoadFromFile(ReportHelper.GetBoxTemplateNameSmall());
+                            //    //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
 
-                            if (part == "A2478850222")
-                            {
-                                report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 后部左侧轮眉装箱单"));//@"D:\New\X247 后部左侧轮眉装箱单.grf"
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                            }
+                            //    SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer1", _boxBll.GetX247LF_LM);
+                            //}
 
-                            if (part == "A2478850122")
-                            {
-                                report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 前部右侧轮眉装箱单"));//@"D:\New\X247 前部右侧轮眉装箱单.grf"
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                            }
+                            //if (part == "A2478850222")
+                            //{
+                            //    ////report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 后部左侧轮眉装箱单"));//@"D:\New\X247 后部左侧轮眉装箱单.grf"
+                            //    //report.LoadFromFile(ReportHelper.GetBoxTemplateNameSmall());
+                            //    //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                            //    SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer1", _boxBll.GetX247LR_LM);
+                            //}
 
-                            if (part == "A2478850322")
-                            {
-                                report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 后部右侧后轮眉装箱单"));//@"D:\New\X247 后部右侧后轮眉装箱单.grf"
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                            }
+                            //if (part == "A2478850122")
+                            //{
+                            //    ////report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 前部右侧轮眉装箱单"));//@"D:\New\X247 前部右侧轮眉装箱单.grf"
+                            //    //report.LoadFromFile(ReportHelper.GetBoxTemplateNameSmall());
+                            //    //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
 
-                            if (part == "A2477309400")
-                            {
-                                report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 后部左侧前轮眉装箱单"));//@"D:\New\X247 后部左侧前轮眉装箱单.grf"
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                            }
+                            //    SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer2", _boxBll.GetX247RF_LM);
+                            //}
 
-                            if (part == "A2477309600")
-                            {
-                                report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 后部右侧前轮眉装箱单"));//@"D:\New\X247 后部右侧前轮眉装箱单.grf"
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                            }
+                            //if (part == "A2478850322")
+                            //{
+                            //    ////report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 后部右侧后轮眉装箱单"));//@"D:\New\X247 后部右侧后轮眉装箱单.grf"
+                            //    //report.LoadFromFile(ReportHelper.GetBoxTemplateNameSmall());
+                            //    //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
 
-                            if (part == "A2477900788" || part == "A2477901300")
-                            {
-                                report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 后部左侧扰流板装箱单"));//@"D:\New\X247 后部左侧扰流板装箱单.grf"
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                            }
+                            //    SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer2", _boxBll.GetX247RR_LM, false);
+                            //}
 
-                            if (part == "A2477900888" || part == "A2477901400")
-                            {
-                                report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 后部右侧扰流板装箱单"));//@"D:\New\X247 后部右侧扰流板装箱单.grf"
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                            }
+                            //if (part == "A2477309400")
+                            //{
+                            //    ////report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 后部左侧前轮眉装箱单"));//@"D:\New\X247 后部左侧前轮眉装箱单.grf"
+                            //    //report.LoadFromFile(ReportHelper.GetBoxTemplateNameSmall());
+                            //    //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+
+                            //    SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer2", _boxBll.GetX247LR_LM);
+                            //}
 
+                            //if (part == "A2477309600")
+                            //{
+                            //    ////report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 后部右侧前轮眉装箱单"));//@"D:\New\X247 后部右侧前轮眉装箱单.grf"
+                            //    //report.LoadFromFile(ReportHelper.GetBoxTemplateNameSmall());
+                            //    //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+
+                            //    SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer2", _boxBll.GetX247HRF_LM);
+                            //}
+
+                            //if (part == "A2477900788" || part == "A2477901300")
+                            //{
+                            //    ////report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 后部左侧扰流板装箱单"));//@"D:\New\X247 后部左侧扰流板装箱单.grf"
+                            //    //report.LoadFromFile(ReportHelper.GetBoxTemplateNameSmall());
+                            //    //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+
+                            //    SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer2", _boxBll.GetX247HL_RLB);
+                            //}
+
+                            //if (part == "A2477900888" || part == "A2477901400")
+                            //{
+                            //    ////report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 后部右侧扰流板装箱单"));//@"D:\New\X247 后部右侧扰流板装箱单.grf"
+                            //    //report.LoadFromFile(ReportHelper.GetBoxTemplateNameSmall());
+                            //    //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+
+                            //    SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer2", _boxBll.GetX247HR_RLB);
+                            //}
                             #endregion
 
-                            if (string.IsNullOrEmpty(fileName))
-                            {
-                                report.Register("");
-                                report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
-                                report.Print(false);
-                            }
-                            else
-                            {
-                                headTable = GetHeadTable();
-                                headTable.Columns.Add("QLevel");
-                                foreach (DataRow dr in headTable.Rows)
-                                {
-                                    string qlevel = _recordBLL.SearchQLevelFromWms("",part);
-                                    dr["QLevel"] = qlevel;
-                                }
-
-                                ReportHelper report2 = new ReportHelper(fileName, headTable, null, (int)GRPaperOrientation.grpoPortrait, 1, report.Printer.PrinterName);
-                                report2.Report.Printer.PrinterName = report.Printer.PrinterName;
-                                report2.Report.Print(false);
-                            }
+                            #endregion
 
+                            //Print(report, fileName, part, moudleType, partType, carType);
+                            UtilityHelper. PrintBox(report, fileName, part, moudleType, partType, carType,GetHeadTable);
                             bll.UpdateInfo(md);
 
                             #endregion
@@ -614,122 +639,139 @@ namespace PurchingMistakeNew
 
                             bll.AddInfo(md);
                             #region 打印装箱单
+                            string moudleType = string.Empty;//例如 后左
+                            string partType = string.Empty;//例如 门板,轮眉
+                            string carType = string.Empty; //车型 X247  H247等
+                            SetPrintInfo(part, report, ref fileName,ref moudleType,ref partType,ref carType);
 
                             //if (part == "A2477209103" || part == "A2477209203" || part == "A2477209305" || part == "A2477203007" || part == "A2477203207" || part == "A2477205006")
                             //{
-                            //    report.LoadFromFile(@"D:\X247 左侧前门板装箱单.grf");
-                            //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                            //    ////report.LoadFromFile(ReportHelper.GetTemplateName("X247左侧前门板装箱单"));//@"D:\New\X247 左侧前门板装箱单.grf"
+                            //    //report.LoadFromFile(ReportHelper.GetBoxTemplateNameBig()); 
+
+                            //    //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                            //    //fileName = ReportHelper.GetTemplateName("X247装箱单");
+                            //    //GetHeadTable = _boxBll.GetX247LF;
+
+                            //    SetBoxPrintInfo(ref fileName, "门板", report, "Printer1", _boxBll.GetX247LF_MB);
+
+
                             //}
 
-                            if (part == "A2477209103" || part == "A2477209203" || part == "A2477209305" || part == "A2477203007" || part == "A2477203207" || part == "A2477205006")
-                            {
-                                report.LoadFromFile(ReportHelper.GetTemplateName("X247左侧前门板装箱单"));//@"D:\New\X247 左侧前门板装箱单.grf"
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                                fileName = ReportHelper.GetTemplateName("X247装箱单");
-                                GetHeadTable = _boxBll.GetX247LF;
-                            }
+                            //if (part == "A2477309401" || part == "A2477309501" || part == "A2477300203" || part == "A2477305303" || part == "A2477305503" || part == "A2477305703")
+                            //{
+                            //    ////report.LoadFromFile(ReportHelper.GetTemplateName("X247左侧后门板装箱单"));//@"D:\New\X247 左侧后门板装箱单.grf"
+                            //    //report.LoadFromFile(ReportHelper.GetBoxTemplateNameBig());
+                            //    //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                            //    //fileName = ReportHelper.GetTemplateName("X247装箱单");
+                            //    //GetHeadTable = _boxBll.GetX247LR;
 
-                            if (part == "A2477309401" || part == "A2477309501" || part == "A2477300203" || part == "A2477305303" || part == "A2477305503" || part == "A2477305703")
-                            {
-                                report.LoadFromFile(ReportHelper.GetTemplateName("X247左侧后门板装箱单"));//@"D:\New\X247 左侧后门板装箱单.grf"
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                                fileName = ReportHelper.GetTemplateName("X247装箱单");
-                                GetHeadTable = _boxBll.GetX247LR;
-                            }
+                            //    SetBoxPrintInfo(ref fileName, "门板", report, "Printer1", _boxBll.GetX247LR_MB);
+                            //}
+
+                            ////if (part == "A2477209303" || part == "A2477209403" || part == "A2477207505" || part == "A2477203107" || part == "A2477203307" || part == "A2477205106")
+                            ////{
+                            ////    report.LoadFromFile(@"D:\New\X247 右侧前门板装箱单.grf");
+                            ////    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                            ////}
 
                             //if (part == "A2477209303" || part == "A2477209403" || part == "A2477207505" || part == "A2477203107" || part == "A2477203307" || part == "A2477205106")
                             //{
-                            //    report.LoadFromFile(@"D:\New\X247 右侧前门板装箱单.grf");
-                            //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                            //    ////report.LoadFromFile(ReportHelper.GetTemplateName("X247右侧前门板装箱单"));//@"D:\New\X247 右侧前门板装箱单.grf"
+                            //    //report.LoadFromFile(ReportHelper.GetBoxTemplateNameBig());
+                            //    //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                            //    //fileName = ReportHelper.GetTemplateName("X247装箱单");
+                            //    //GetHeadTable = _boxBll.GetX247RF;
+
+                            //    SetBoxPrintInfo(ref fileName, "门板", report, "Printer2", _boxBll.GetX247LR_MB);
                             //}
 
-                            if (part == "A2477209303" || part == "A2477209403" || part == "A2477207505" || part == "A2477203107" || part == "A2477203307" || part == "A2477205106")
-                            {
-                                report.LoadFromFile(ReportHelper.GetTemplateName("X247右侧前门板装箱单"));//@"D:\New\X247 右侧前门板装箱单.grf"
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                                fileName = ReportHelper.GetTemplateName("X247装箱单");
-                                GetHeadTable = _boxBll.GetX247RF;
-                            }
+                            //if (part == "A2477309601" || part == "A2477309701" || part == "A2477300303" || part == "A2477305403" || part == "A2477305603" || part == "A2477305803")
+                            //{
+                            //    ////report.LoadFromFile(ReportHelper.GetTemplateName("X247右侧后门板装箱单"));//@"D:\New\X247 右侧后门板装箱单.grf"
+                            //    //report.LoadFromFile(ReportHelper.GetBoxTemplateNameBig());
+                            //    //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                            //    //fileName = ReportHelper.GetTemplateName("X247装箱单");
+                            //    //GetHeadTable = _boxBll.GetX247RR;
 
-                            if (part == "A2477309601" || part == "A2477309701" || part == "A2477300303" || part == "A2477305403" || part == "A2477305603" || part == "A2477305803")
-                            {
-                                report.LoadFromFile(ReportHelper.GetTemplateName("X247右侧后门板装箱单"));//@"D:\New\X247 右侧后门板装箱单.grf"
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                                fileName = ReportHelper.GetTemplateName("X247装箱单");
-                                GetHeadTable = _boxBll.GetX247RR;
-                            }
+                            //    SetBoxPrintInfo(ref fileName, "门板", report, "Printer2", _boxBll.GetX247RR_MB);
+                            //}
 
-                            if (part == "A2478850022")
-                            {
-                                report.LoadFromFile(ReportHelper.GetTemplateNameD("X247 前部左侧轮眉装箱单"));//@"D:\X247 前部左侧轮眉装箱单.grf"
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                            }
+                            //if (part == "A2478850022")
+                            //{
+                            //    ////report.LoadFromFile(ReportHelper.GetTemplateNameD("X247 前部左侧轮眉装箱单"));//@"D:\X247 前部左侧轮眉装箱单.grf"
+                            //    //report.LoadFromFile(ReportHelper.GetBoxTemplateNameSmall());
+                            //    //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
 
-                            if (part == "A2478850222")
-                            {
-                                report.LoadFromFile(ReportHelper.GetTemplateNameD("X247 后部左侧轮眉装箱单"));//@"D:\X247 后部左侧轮眉装箱单.grf"
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                            }
+                            //    SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer1", _boxBll.GetX247LF_LM);
+                            //}
 
-                            if (part == "A2478850122")
-                            {
-                                report.LoadFromFile(ReportHelper.GetTemplateNameD("X247 前部右侧轮眉装箱单"));//@"D:\X247 前部右侧轮眉装箱单.grf"
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                            }
+                            //if (part == "A2478850222")
+                            //{
+                            //    ////report.LoadFromFile(ReportHelper.GetTemplateNameD("X247 后部左侧轮眉装箱单"));//@"D:\X247 后部左侧轮眉装箱单.grf"
+                            //    //report.LoadFromFile(ReportHelper.GetBoxTemplateNameSmall());
+                            //    //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
 
-                            if (part == "A2478850322")
-                            {
-                                report.LoadFromFile(ReportHelper.GetTemplateNameD("X247 后部右侧后轮眉装箱单"));//@"D:\X247 后部右侧后轮眉装箱单.grf"
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                            }
+                            //    SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer1", _boxBll.GetX247LR_LM);
+                            //}
 
-                            if (part == "A2477309400")
-                            {
-                                report.LoadFromFile(ReportHelper.GetTemplateNameD("X247 后部左侧前轮眉装箱单"));//@"D:\X247 后部左侧前轮眉装箱单.grf"
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                            }
+                            //if (part == "A2478850122")
+                            //{
+                            //    ////report.LoadFromFile(ReportHelper.GetTemplateNameD("X247 前部右侧轮眉装箱单"));//@"D:\X247 前部右侧轮眉装箱单.grf"
+                            //    //report.LoadFromFile(ReportHelper.GetBoxTemplateNameSmall());
+                            //    //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
 
-                            if (part == "A2477309600")
-                            {
-                                report.LoadFromFile(ReportHelper.GetTemplateNameD("X247 后部右侧前轮眉装箱单"));//@"D:\X247 后部右侧前轮眉装箱单.grf"
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                            }
+                            //    SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer2", _boxBll.GetX247RF_LM);
+                            //}
 
-                            if (part == "A2477900788" || part == "A2477901300")
-                            {
-                                report.LoadFromFile(ReportHelper.GetTemplateNameD("X247 后部左侧扰流板装箱单"));//@"D:\X247 后部左侧扰流板装箱单.grf"
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                            }
+                            //if (part == "A2478850322")
+                            //{
+                            //    ////report.LoadFromFile(ReportHelper.GetTemplateNameD("X247 后部右侧后轮眉装箱单"));//@"D:\X247 后部右侧后轮眉装箱单.grf"
+                            //    //report.LoadFromFile(ReportHelper.GetBoxTemplateNameSmall());
+                            //    //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
 
-                            if (part == "A2477900888" || part == "A2477901400")
-                            {
-                                report.LoadFromFile(ReportHelper.GetTemplateNameD("X247 后部右侧扰流板装箱单"));//@"D:\X247 后部右侧扰流板装箱单.grf"
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                            }
+                            //    SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer2", _boxBll.GetX247HRH_LM);
+                            //}
 
-                            #endregion
+                            //if (part == "A2477309400")
+                            //{
+                            //    ////report.LoadFromFile(ReportHelper.GetTemplateNameD("X247 后部左侧前轮眉装箱单"));//@"D:\X247 后部左侧前轮眉装箱单.grf"
+                            //    //report.LoadFromFile(ReportHelper.GetBoxTemplateNameSmall());
+                            //    //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
 
-                            if (string.IsNullOrEmpty(fileName))
-                            {
-                                report.Register("");
-                                report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
-                                report.Print(false);
-                            }
-                            else
-                            {
-                                headTable = GetHeadTable();
-                                headTable.Columns.Add("QLevel");
-                                foreach (DataRow dr in headTable.Rows)
-                                {
-                                    string qlevel = _recordBLL.SearchQLevelFromWms("", part);
-                                    dr["QLevel"] = qlevel;
-                                }
-
-                                ReportHelper report2 = new ReportHelper(fileName, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, report.Printer.PrinterName);
-                                report2.Report.Printer.PrinterName = report.Printer.PrinterName;
-                                report2.Report.Print(false);
-                            }
+                            //    SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer2", _boxBll.GetX247HLF_LM);
+                            //}
+
+                            //if (part == "A2477309600")
+                            //{
+                            //    ////report.LoadFromFile(ReportHelper.GetTemplateNameD("X247 后部右侧前轮眉装箱单"));//@"D:\X247 后部右侧前轮眉装箱单.grf"
+                            //    //report.LoadFromFile(ReportHelper.GetBoxTemplateNameSmall());
+                            //    //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+
+                            //    SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer2", _boxBll.GetX247HRF_LM);
+                            //}
 
+                            //if (part == "A2477900788" || part == "A2477901300")
+                            //{
+                            //    ////report.LoadFromFile(ReportHelper.GetTemplateNameD("X247 后部左侧扰流板装箱单"));//@"D:\X247 后部左侧扰流板装箱单.grf"
+                            //    //report.LoadFromFile(ReportHelper.GetBoxTemplateNameSmall());
+                            //    //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+
+                            //    SetBoxPrintInfo(ref fileName, "扰流板", report, "Printer2", _boxBll.GetX247HL_RLB);
+                            //}
+
+                            //if (part == "A2477900888" || part == "A2477901400")
+                            //{
+                            //    ////report.LoadFromFile(ReportHelper.GetTemplateNameD("X247 后部右侧扰流板装箱单"));//@"D:\X247 后部右侧扰流板装箱单.grf"
+                            //    //report.LoadFromFile(ReportHelper.GetBoxTemplateNameSmall());
+                            //    //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+
+                            //    SetBoxPrintInfo(ref fileName, "扰流板", report, "Printer2", _boxBll.GetX247HR_RLB);
+                            //}
+
+                            #endregion 
+                            //Print(report, fileName, part, moudleType,partType,carType);
+                            UtilityHelper.PrintBox(report, fileName, part, moudleType, partType, carType, GetHeadTable);
                             bll.UpdateInfo(md);
 
                             #endregion
@@ -747,7 +789,277 @@ namespace PurchingMistakeNew
                 LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
             }
         }
-        
+        ///// <summary>
+        ///// 箱码打印
+        ///// </summary>
+        ///// <param name="report"></param>
+        ///// <param name="fileName">打印模板路径</param>
+        ///// <param name="part">零件号,用于查询QLevel</param>
+        ///// <param name="moudleType">模板类型,例如前左前,前右前</param>
+        ///// <param name="partType">零件类型 例如门板,轮眉,扰流板</param>
+        ///// <param name="carType">产线 例如X247 X243</param>
+        //void Print(GridppReport report, string fileName, string part,string moudleType,string partType,string carType)
+        //{
+        //    DataTable headTable = null;
+        //    if (string.IsNullOrEmpty(fileName))
+        //    {
+        //        report.Register("");
+        //        report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
+        //        report.Print(false);
+        //    }
+        //    else
+        //    {
+        //        headTable = GetHeadTable();
+        //        headTable.Columns.Add("QLevel");
+        //        headTable.Columns.Add("FB");
+        //        headTable.Columns.Add("LR");
+        //        headTable.Columns.Add("Dis");
+        //        foreach (DataRow dr in headTable.Rows)
+        //        {
+        //            string qlevel = _recordBLL.SearchQLevelFromWms("", part);
+        //            dr["QLevel"] = qlevel;
+        //        }
+        //        string fb = string.Empty;
+        //        string lr = string.Empty;
+        //        string dis = string.Empty;
+        //        if(partType == "轮眉")
+        //        {
+        //            if (carType.Contains("247"))
+        //            {
+        //                UtilityHelper.Get247LMBoxPrintDisplay(moudleType, ref fb, ref lr, ref dis);
+        //            }
+        //            else if (carType.Contains("243"))
+        //            {
+        //                UtilityHelper.Get243LMBoxPrintDisplay(moudleType, ref fb, ref lr, ref dis);
+        //            }
+        //        }
+        //        else if(partType == "扰流板")
+        //        {
+        //            if (carType.Contains("247"))
+        //            {
+        //                UtilityHelper.Get247RLBBoxPrintDisplay(moudleType, ref fb, ref lr, ref dis);
+        //            } 
+        //        }
+        //        headTable.Rows[0]["FB"] = fb;
+        //        headTable.Rows[0]["LR"] = lr;
+        //        headTable.Rows[0]["Dis"] = dis;
+
+        //        ReportHelper report2 = new ReportHelper(fileName, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, report.Printer.PrinterName);
+        //        report2.Report.Printer.PrinterName = report.Printer.PrinterName;
+        //        report2.Report.Print(false);
+        //    }
+        //}
+
+        /// <summary>
+        /// 设置打印信息
+        /// </summary>
+        /// <param name="part"></param>
+        /// <param name="report"></param>
+        /// <param name="fileName"></param>
+        /// <param name="moudleType">模板类型,例如前左,后左</param>
+        /// <param name="partType">零件类型,例如门板,轮眉</param>
+        void SetPrintInfo(string part, GridppReport report,ref string fileName,ref string moudleType,ref string partType,ref string carType)
+        {
+            if (part == "A2477209103" || part == "A2477209203" || part == "A2477209305" || part == "A2477203007" || part == "A2477203207" || part == "A2477205006")
+            {
+                ////report.LoadFromFile(ReportHelper.GetTemplateName("X247左侧前门板装箱单"));//@"D:\New\X247 左侧前门板装箱单.grf"
+                //report.LoadFromFile(ReportHelper.GetBoxTemplateNameBig());
+                //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                ////fileName = ReportHelper.GetTemplateName("X247装箱单");
+                //fileName = ReportHelper.GetBoxTemplateNameBig();
+                //GetHeadTable = _boxBll.GetX247LF;
+
+                moudleType = "前左";
+                partType = "门板";
+                carType = "X247";
+                UtilityHelper.SetBoxPrintInfo(ref fileName, "门板", report, "Printer1", true);
+                GetHeadTable = _boxBll.GetX247LF_MB;
+                //SetBoxPrintInfo(ref fileName, "门板", report, "Printer1", _boxBll.GetX247LF_MB,true);
+            }
+
+
+            if (part == "A2477309401" || part == "A2477309501" || part == "A2477300203" || part == "A2477305303" || part == "A2477305503" || part == "A2477305703")
+            {
+                ////report.LoadFromFile(ReportHelper.GetTemplateName("X247左侧后门板装箱单"));//@"D:\New\X247 左侧后门板装箱单.grf"
+                ////fileName = ReportHelper.GetTemplateName("X247装箱单");
+                //report.LoadFromFile(ReportHelper.GetBoxTemplateNameBig());
+                //fileName = ReportHelper.GetBoxTemplateNameBig();
+                //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                //GetHeadTable = _boxBll.GetX247LR;
+                moudleType = "后左";
+                partType = "门板";
+                carType = "X247";
+                UtilityHelper.SetBoxPrintInfo(ref fileName, "门板", report, "Printer1",  true);
+                GetHeadTable = _boxBll.GetX247LR_MB;
+                //SetBoxPrintInfo(ref fileName, "门板", report, "Printer1", _boxBll.GetX247LR_MB,true);
+            }
+
+            if (part == "A2477209303" || part == "A2477209403" || part == "A2477207505" || part == "A2477203107" || part == "A2477203307" || part == "A2477205106")
+            {
+                ////report.LoadFromFile(ReportHelper.GetTemplateName("X247右侧前门板装箱单"));//@"D:\New\X247 右侧前门板装箱单.grf"
+                ////fileName = ReportHelper.GetTemplateName("X247装箱单");
+                //report.LoadFromFile(ReportHelper.GetBoxTemplateNameBig());
+                //fileName = ReportHelper.GetBoxTemplateNameBig();
+                //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                //GetHeadTable = _boxBll.GetX247RF;
+                moudleType = "前右";
+                partType = "门板";
+                carType = "X247";
+                UtilityHelper.SetBoxPrintInfo(ref fileName, "门板", report, "Printer2", true);
+                GetHeadTable = _boxBll.GetX247RF_MB;
+                //SetBoxPrintInfo(ref fileName, "门板", report, "Printer2", _boxBll.GetX247RF_MB,true);
+            }
+
+            if (part == "A2477309601" || part == "A2477309701" || part == "A2477300303" || part == "A2477305403" || part == "A2477305603" || part == "A2477305803")
+            {
+                ////report.LoadFromFile(ReportHelper.GetTemplateName("X247右侧后门板装箱单"));//@"D:\New\X247 右侧后门板装箱单.grf"
+                ////fileName = ReportHelper.GetTemplateName("X247装箱单");
+                //report.LoadFromFile(ReportHelper.GetBoxTemplateNameBig());
+                //fileName = ReportHelper.GetBoxTemplateNameBig();
+                //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                //GetHeadTable = _boxBll.GetX247RR;
+                moudleType = "后右";
+                partType = "门板";
+                carType = "X247";
+                UtilityHelper.SetBoxPrintInfo(ref fileName, "门板", report, "Printer2", true);
+                GetHeadTable = _boxBll.GetX247RR_MB;
+
+               // SetBoxPrintInfo(ref fileName, "门板",  report, "Printer2", _boxBll.GetX247RR_MB,true);
+            }
+
+            if (part == "A2478850022")
+            {
+                ////report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 前部左侧轮眉装箱单"));//@"D:\New\X247 前部左侧轮眉装箱单.grf"
+                //report.LoadFromFile(ReportHelper.GetBoxTemplateNameSmall());
+                //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                moudleType = "前左";
+                partType = "轮眉";
+                carType = "X247";
+                UtilityHelper.SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer1", true);
+                GetHeadTable = _boxBll.GetX247LF_LM;
+                //SetBoxPrintInfo(ref fileName, "轮眉",  report, "Printer1", _boxBll.GetX247LF_LM,true);
+            }
+
+            if (part == "A2478850222")
+            {
+                ////report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 后部左侧轮眉装箱单"));//@"D:\New\X247 后部左侧轮眉装箱单.grf"
+                //report.LoadFromFile(ReportHelper.GetBoxTemplateNameSmall());
+                //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                moudleType = "后左";
+                partType = "轮眉";
+                carType = "X247";
+                UtilityHelper.SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer1", true);
+                GetHeadTable = _boxBll.GetX247LR_LM;
+                //SetBoxPrintInfo(ref fileName, "轮眉",  report, "Printer1", _boxBll.GetX247LR_LM, true);
+            }
+
+            if (part == "A2478850122")
+            {
+                ////report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 前部右侧轮眉装箱单"));//@"D:\New\X247 前部右侧轮眉装箱单.grf"
+                //report.LoadFromFile(ReportHelper.GetBoxTemplateNameSmall());
+                //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                moudleType = "前右";
+                carType = "X247";
+                UtilityHelper.SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer2", true);
+                GetHeadTable = _boxBll.GetX247RF_LM;
+                //SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer2", _boxBll.GetX247RF_LM, true);
+            }
+
+            if (part == "A2478850322")
+            {
+                ////report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 后部右侧后轮眉装箱单"));//@"D:\New\X247 后部右侧后轮眉装箱单.grf"
+                //report.LoadFromFile(ReportHelper.GetBoxTemplateNameSmall());
+                //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                moudleType = "后右后";
+                partType = "轮眉";
+                carType = "X247";
+                UtilityHelper.SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer2",  true);
+                GetHeadTable = _boxBll.GetX247RR_LM;
+                //SetBoxPrintInfo(ref fileName, "轮眉",  report, "Printer2", _boxBll.GetX247RR_LM, true);
+            }
+
+            if (part == "A2477309400")
+            {
+                ////report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 后部左侧前轮眉装箱单"));//@"D:\New\X247 后部左侧前轮眉装箱单.grf"
+                //report.LoadFromFile(ReportHelper.GetBoxTemplateNameSmall());
+                //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                moudleType = "后左前";
+                partType = "轮眉";
+                carType = "X247";
+                UtilityHelper.SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer2",  true);
+                GetHeadTable = _boxBll.GetX247HLF_LM;
+                //SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer2", _boxBll.GetX247HLF_LM, true);
+            }
+
+            if (part == "A2477309600")
+            {
+                ////report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 后部右侧前轮眉装箱单"));//@"D:\New\X247 后部右侧前轮眉装箱单.grf"
+                //report.LoadFromFile(ReportHelper.GetBoxTemplateNameSmall());
+                //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                moudleType = "后右前";
+                partType = "轮眉";
+                carType = "X247";
+                UtilityHelper.SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer2",  true);
+                GetHeadTable = _boxBll.GetX247HRF_LM;
+                //SetBoxPrintInfo(ref fileName, "轮眉",  report, "Printer2", _boxBll.GetX247HRF_LM, true);
+            }
+
+            if (part == "A2477900788" || part == "A2477901300")
+            {
+                ////report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 后部左侧扰流板装箱单"));//@"D:\New\X247 后部左侧扰流板装箱单.grf"
+                //report.LoadFromFile(ReportHelper.GetBoxTemplateNameSmall());
+                //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                moudleType = "后左X";
+                partType = "扰流板";
+                carType = "X247";
+                UtilityHelper.SetBoxPrintInfo(ref fileName, "扰流板", report, "Printer2", true);
+                GetHeadTable = _boxBll.GetX247HL_RLB;
+                //SetBoxPrintInfo(ref fileName, "扰流板", report, "Printer2", _boxBll.GetX247HL_RLB, true);
+            }
+
+            if (part == "A2477900888" || part == "A2477901400")
+            {
+                ////report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 后部右侧扰流板装箱单"));//@"D:\New\X247 后部右侧扰流板装箱单.grf"
+                //report.LoadFromFile(ReportHelper.GetBoxTemplateNameSmall());
+                //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                moudleType = "后右X";
+                partType = "扰流板";
+                carType = "X247";
+                UtilityHelper.SetBoxPrintInfo(ref fileName, "扰流板", report, "Printer2", true);
+                GetHeadTable = _boxBll.GetX247HR_RLB;
+                //SetBoxPrintInfo(ref fileName, "扰流板", report, "Printer2", _boxBll.GetX247HR_RLB, true);
+            }
+        }
+       
+
+        void SetBoxPrintInfo(ref string fileName, string printType,GridppReport report, string printerName, Func<DataTable> getData,bool is247=true)
+        {
+            if (printType == "门板")
+            {
+                fileName = ReportHelper.GetBoxTemplateNameDoor();
+            }
+            else if (printType == "轮眉")
+            {
+                if(is247 == true)
+                {
+                    fileName = ReportHelper.GetBoxTemplateNameWheelBrow247();
+                }
+                else
+                {
+                    fileName = ReportHelper.GetBoxTemplateNameWheelBrow243();
+                }
+            }
+            else if (printType == "扰流板")
+            {
+                fileName = ReportHelper.GetBoxTemplateNameSpoiler();
+            }
+
+            report.LoadFromFile(fileName);
+            report.Printer.PrinterName = ConfigurationManager.AppSettings[printerName].ToString();
+            GetHeadTable = getData;
+           
+        }
+
         private void textBox1_KeyDown(object sender, KeyEventArgs e)
         {
             MistakeBLL mbll=new MistakeBLL();
@@ -987,116 +1299,136 @@ namespace PurchingMistakeNew
 
                     DataTable headTable = null;
                     string fileName = string.Empty;
-                     
+
                     #region 打印装箱单
+                    string moudleType = string.Empty;//例如 后左
+                    string partType = string.Empty;//例如 门板,轮眉
+                    string carType = string.Empty; //车型 X247  H247等
+                    SetPrintInfo(part, report, ref fileName, ref moudleType, ref partType, ref carType);
 
-                    if (part == "A2477209103" || part == "A2477209203" || part == "A2477209305" || part == "A2477203007" || part == "A2477203207" || part == "A2477205006")
-                    {
-                        report.LoadFromFile(ReportHelper.GetTemplateName("X247左侧前门板装箱单"));//@"D:\New\X247 左侧前门板装箱单.grf"
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                    #region 以前的
+                    //if (part == "A2477209103" || part == "A2477209203" || part == "A2477209305" || part == "A2477203007" || part == "A2477203207" || part == "A2477205006")
+                    //{
+                    //    ////report.LoadFromFile(ReportHelper.GetTemplateName("X247左侧前门板装箱单"));//@"D:\New\X247 左侧前门板装箱单.grf"
+                    //    //report.LoadFromFile(ReportHelper.GetBoxTemplateNameBig());
+                    //    //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                    //    //fileName = ReportHelper.GetTemplateName("X247装箱单");
+                    //    //GetHeadTable = _boxBll.GetX247LF;
 
-                        fileName = ReportHelper.GetTemplateName("X247装箱单");
-                        GetHeadTable = _boxBll.GetX247LF;
-                    }
+                    //    SetBoxPrintInfo(ref fileName, "门板", report, "Printer1", _boxBll.GetX247LF_MB);
 
+                    //}
 
-                    if (part == "A2477309401" || part == "A2477309501" || part == "A2477300203" || part == "A2477305303" || part == "A2477305503" || part == "A2477305703")
-                    {
-                        report.LoadFromFile(ReportHelper.GetTemplateName("X247左侧后门板装箱单"));//@"D:\New\X247 左侧后门板装箱单.grf"
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                        fileName = ReportHelper.GetTemplateName("X247装箱单");
-                        GetHeadTable = _boxBll.GetX247LR;
-                    }
+                    //if (part == "A2477309401" || part == "A2477309501" || part == "A2477300203" || part == "A2477305303" || part == "A2477305503" || part == "A2477305703")
+                    //{
+                    //    ////report.LoadFromFile(ReportHelper.GetTemplateName("X247左侧后门板装箱单"));//@"D:\New\X247 左侧后门板装箱单.grf"
+                    //    //report.LoadFromFile(ReportHelper.GetBoxTemplateNameBig());
+                    //    //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                    //    //fileName = ReportHelper.GetTemplateName("X247装箱单");
+                    //    //GetHeadTable = _boxBll.GetX247LR;
 
-                    if (part == "A2477209303" || part == "A2477209403" || part == "A2477207505" || part == "A2477203107" || part == "A2477203307" || part == "A2477205106")
-                    {
-                        report.LoadFromFile(ReportHelper.GetTemplateName("X247右侧前门板装箱单"));//@"D:\New\X247 右侧前门板装箱单.grf"
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                        fileName = ReportHelper.GetTemplateName("X247装箱单");
-                        GetHeadTable = _boxBll.GetX247RF;
-                    }
+                    //    SetBoxPrintInfo(ref fileName, "门板", report, "Printer1", _boxBll.GetX247LR_MB);
+                    //}
 
-                    if (part == "A2477309601" || part == "A2477309701" || part == "A2477300303" || part == "A2477305403" || part == "A2477305603" || part == "A2477305803")
-                    {
-                        report.LoadFromFile(ReportHelper.GetTemplateName("X247右侧后门板装箱单"));//@"D:\New\X247 右侧后门板装箱单.grf"
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                    //if (part == "A2477209303" || part == "A2477209403" || part == "A2477207505" || part == "A2477203107" || part == "A2477203307" || part == "A2477205106")
+                    //{
+                    //    ////report.LoadFromFile(ReportHelper.GetTemplateName("X247右侧前门板装箱单"));//@"D:\New\X247 右侧前门板装箱单.grf"
+                    //    //report.LoadFromFile(ReportHelper.GetBoxTemplateNameBig());
+                    //    //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                    //    //fileName = ReportHelper.GetTemplateName("X247装箱单");
+                    //    //GetHeadTable = _boxBll.GetX247RF;
 
-                        fileName = ReportHelper.GetTemplateName("X247装箱单");
-                        GetHeadTable = _boxBll.GetX247RR;
-                    }
+                    //    SetBoxPrintInfo(ref fileName, "门板", report, "Printer2", _boxBll.GetX247RF_MB);
+                    //}
 
-                    if (part == "A2478850022")
-                    {
-                        report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 前部左侧轮眉装箱单"));//@"D:\New\X247 前部左侧轮眉装箱单.grf"
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                    }
+                    //if (part == "A2477309601" || part == "A2477309701" || part == "A2477300303" || part == "A2477305403" || part == "A2477305603" || part == "A2477305803")
+                    //{
+                    //    ////report.LoadFromFile(ReportHelper.GetTemplateName("X247右侧后门板装箱单"));//@"D:\New\X247 右侧后门板装箱单.grf"
+                    //    //report.LoadFromFile(ReportHelper.GetBoxTemplateNameBig());
+                    //    //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
 
-                    if (part == "A2478850222")
-                    {
-                        report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 后部左侧轮眉装箱单"));//@"D:\New\X247 后部左侧轮眉装箱单.grf"
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                    }
+                    //    //fileName = ReportHelper.GetTemplateName("X247装箱单");
+                    //    //GetHeadTable = _boxBll.GetX247RR;
 
-                    if (part == "A2478850122")
-                    {
-                        report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 前部右侧轮眉装箱单"));//@"D:\New\X247 前部右侧轮眉装箱单.grf"
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                    }
+                    //    SetBoxPrintInfo(ref fileName, "门板", report, "Printer2", _boxBll.GetX247RR_MB);
+                    //}
 
-                    if (part == "A2478850322")
-                    {
-                        report.LoadFromFile(ReportHelper.GetTemplateNameD("X247 后部右侧后轮眉装箱单"));//@"D:\X247 后部右侧后轮眉装箱单.grf"
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                    }
+                    //if (part == "A2478850022")
+                    //{
+                    //    //report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 前部左侧轮眉装箱单"));//@"D:\New\X247 前部左侧轮眉装箱单.grf"
+                    //    report.LoadFromFile(ReportHelper.GetBoxTemplateNameSmall());
+                    //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
 
-                    if (part == "A2477309400")
-                    {
-                        report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 后部左侧前轮眉装箱单"));//@"D:\New\X247 后部左侧前轮眉装箱单.grf"
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                    }
+                    //    SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer1", _boxBll.GetX247LF_LM);                    }
 
-                    if (part == "A2477309600")
-                    {
-                        report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 后部右侧前轮眉装箱单"));//@"D:\New\X247 后部右侧前轮眉装箱单.grf"
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                    }
+                    //if (part == "A2478850222")
+                    //{
+                    //    ////report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 后部左侧轮眉装箱单"));//@"D:\New\X247 后部左侧轮眉装箱单.grf"
+                    //    //report.LoadFromFile(ReportHelper.GetBoxTemplateNameSmall());
+                    //    //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
 
-                    if (part == "A2477900788" || part == "A2477901300")
-                    {
-                        report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 后部左侧扰流板装箱单"));//@"D:\New\X247 后部左侧扰流板装箱单.grf"
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                    }
+                    //    SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer1", _boxBll.GetX247LR_LM);
+                    //}
 
-                    if (part == "A2477900888" || part == "A2477901400")
-                    {
-                        report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 后部右侧扰流板装箱单"));//@"D:\New\X247 后部右侧扰流板装箱单.grf"
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                    }
+                    //if (part == "A2478850122")
+                    //{
+                    //    ////report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 前部右侧轮眉装箱单"));//@"D:\New\X247 前部右侧轮眉装箱单.grf"
+                    //    //report.LoadFromFile(ReportHelper.GetBoxTemplateNameSmall());
+                    //    //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
 
-                    #endregion
+                    //    SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer2", _boxBll.GetX247RF_LM);
+                    //}
 
-                    if (string.IsNullOrEmpty(fileName))
-                    {
-                        report.Register("");
-                        report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
-                        report.Print(false);
-                    }
-                    else
-                    {
-                        headTable = GetHeadTable();
-                        headTable.Columns.Add("QLevel");
-                        foreach (DataRow dr in headTable.Rows)
-                        {
-                            string qlevel = _recordBLL.SearchQLevelFromWms("", part);
-                            dr["QLevel"] = qlevel;
-                        }
+                    //if (part == "A2478850322")
+                    //{
+                    //    //// report.LoadFromFile(ReportHelper.GetTemplateNameD("X247 后部右侧后轮眉装箱单"));//@"D:\X247 后部右侧后轮眉装箱单.grf"
+                    //    //report.LoadFromFile(ReportHelper.GetBoxTemplateNameSmall());
+                    //    //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
 
-                        ReportHelper report2 = new ReportHelper(fileName, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, report.Printer.PrinterName);
-                        report2.Report.Printer.PrinterName = report.Printer.PrinterName;
-                        report2.Report.Print(false);
-                    }
-                    
+                    //    SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer2", _boxBll.GetX247HRH_LM);
+                    //}
+
+                    //if (part == "A2477309400")
+                    //{
+                    //    ////report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 后部左侧前轮眉装箱单"));//@"D:\New\X247 后部左侧前轮眉装箱单.grf"
+                    //    //report.LoadFromFile(ReportHelper.GetBoxTemplateNameSmall());
+                    //    //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+
+                    //    SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer2", _boxBll.GetX247HLF_LM);
+                    //}
+
+                    //if (part == "A2477309600")
+                    //{
+                    //    ////report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 后部右侧前轮眉装箱单"));//@"D:\New\X247 后部右侧前轮眉装箱单.grf"
+                    //    //report.LoadFromFile(ReportHelper.GetBoxTemplateNameSmall());
+                    //    //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+
+                    //    SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer2", _boxBll.GetX247HRF_LM);
+                    //}
+
+                    //if (part == "A2477900788" || part == "A2477901300")
+                    //{
+                    //    //report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 后部左侧扰流板装箱单"));//@"D:\New\X247 后部左侧扰流板装箱单.grf"
+                    //    report.LoadFromFile(ReportHelper.GetBoxTemplateNameBig());
+                    //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+
+                    //    SetBoxPrintInfo(ref fileName, "扰流板", report, "Printer2", _boxBll.GetX247HL_RLB);
+                    //}
+
+                    //if (part == "A2477900888" || part == "A2477901400")
+                    //{
+                    //    //report.LoadFromFile(ReportHelper.GetTemplateNameDNew("X247 后部右侧扰流板装箱单"));//@"D:\New\X247 后部右侧扰流板装箱单.grf"
+                    //    report.LoadFromFile(ReportHelper.GetBoxTemplateNameBig());
+                    //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+
+                    //    SetBoxPrintInfo(ref fileName, "扰流板", report, "Printer2", _boxBll.GetX247HR_RLB);
+                    //}
+                    #endregion
+
+                    #endregion
 
+                    //Print(report, fileName, part,moudleType,partType,carType);
+                    UtilityHelper.PrintBox(report, fileName, part, moudleType, partType, carType, GetHeadTable);
                     bll.UpdateInfo(md);
                 }
 
diff --git a/PurchingMistakeNew/Form4.cs b/PurchingMistakeNew/Form4.cs
index 4f0e8f9..a38444f 100644
--- a/PurchingMistakeNew/Form4.cs
+++ b/PurchingMistakeNew/Form4.cs
@@ -18,6 +18,8 @@ namespace PurchingMistakeNew
 {
     public partial class Form4 : Form
     {
+        private Func<DataTable> GetHeadTable = null;
+        private RecordBLL _recordBLL = new RecordBLL();
         public Form4()
         {
             InitializeComponent();
@@ -237,68 +239,109 @@ namespace PurchingMistakeNew
 
                                 #region 轮眉
 
+                                DataTable headTable = null;
+                                string fileName = string.Empty;
+
                                 if (partNo == "1230002609")
                                 {
                                     md.PartType = "X247 前部左侧轮眉";
                                     type = 3;
-                                    report.LoadFromFile(@"D:\X247 前部左侧轮眉.grf");
 
-                                    report.Printer.PrinterName =
-                                        ConfigurationManager.AppSettings["Printer1"].ToString();
+                                    //fileName = ReportHelper.GetTemplateNameD("X247 前部左侧轮眉"); //(@"D:\X247 后部左侧后轮眉.grf");
+                                    //report.LoadFromFile(fileName);
+
+                                    //report.Printer.PrinterName =
+                                    //    ConfigurationManager.AppSettings["Printer1"].ToString();
+                                    //GetHeadTable = _recordBLL.GetLMX247LF;
+
+                                    //SetPrintInfo(ref fileName, "轮眉", report, "Printer1", _recordBLL.GetLMX247LF);
+                                    UtilityHelper.SetPrintInfo(ref fileName, "轮眉247", report, "Printer1");
+                                    GetHeadTable = _recordBLL.GetLMX247LF;
                                 }
 
                                 if (partNo == "1230002615")
                                 {
                                     md.PartType = "X247 后部左侧轮眉";
                                     type = 3;
-                                    report.LoadFromFile(@"D:\X247 后部左侧后轮眉.grf");
+                                    //fileName = ReportHelper.GetTemplateNameD("X247 后部左侧轮眉");
 
-                                    report.Printer.PrinterName =
-                                        ConfigurationManager.AppSettings["Printer1"].ToString();
-                                }
+                                    //report.LoadFromFile(fileName);
+
+                                    //report.Printer.PrinterName =
+                                    //    ConfigurationManager.AppSettings["Printer1"].ToString();
+                                    //GetHeadTable = _recordBLL.GetLMX247LH;
 
+                                    //SetPrintInfo(ref fileName, "轮眉", report, "Printer1", _recordBLL.GetLMX247LH);
+                                    UtilityHelper.SetPrintInfo(ref fileName, "轮眉247", report, "Printer1");
+                                    GetHeadTable = _recordBLL.GetLMX247LH;
+                                }
+                              
                                 if (partNo == "1230002612")
                                 {
                                     md.PartType = "X247 前部右侧轮眉";
                                     type = 4;
-                                    report.LoadFromFile(@"D:\X247 前部右侧轮眉.grf");
 
-                                    report.Printer.PrinterName =
-                                        ConfigurationManager.AppSettings["Printer2"].ToString();
+                                    //fileName = ReportHelper.GetTemplateNameD("X247 前部右侧轮眉");
+                                    //report.LoadFromFile(fileName);
+
+                                    //report.Printer.PrinterName =
+                                    //    ConfigurationManager.AppSettings["Printer2"].ToString();
+                                    //GetHeadTable = _recordBLL.GetLMX247FR;
+
+                                    //SetPrintInfo(ref fileName, "轮眉", report, "Printer2", _recordBLL.GetLMX247FR);
+                                    UtilityHelper.SetPrintInfo(ref fileName, "轮眉247", report, "Printer2");
+                                    GetHeadTable = _recordBLL.GetLMX247FR;
                                 }
 
                                 if (partNo == "1230002617")
                                 {
                                     md.PartType = "X247 右侧后部后轮眉";
                                     type = 4;
+                                    //fileName = ReportHelper.GetTemplateNameD("X247 右侧后部后轮眉");
+                                    //report.LoadFromFile(fileName);
 
-                                    report.LoadFromFile(@"D:\X247 右侧后部后轮眉.grf");
+                                    //report.Printer.PrinterName =
+                                    //    ConfigurationManager.AppSettings["Printer2"].ToString();
+                                    //GetHeadTable = _recordBLL.GetLMX247RHH;
 
-                                    report.Printer.PrinterName =
-                                        ConfigurationManager.AppSettings["Printer2"].ToString();
+                                    //SetPrintInfo(ref fileName, "轮眉", report, "Printer2", _recordBLL.GetLMX247HRH);
+                                    UtilityHelper.SetPrintInfo(ref fileName, "轮眉247", report, "Printer2");
+                                    GetHeadTable = _recordBLL.GetLMX247HRH;
                                 }
 
                                 if (partNo == "1230002619")
                                 {
                                     md.PartType = "X247 后部左侧前轮眉";
-
                                     type = 5;
-                                    report.LoadFromFile(@"D:\X247 后部左侧轮眉.grf");
 
-                                    report.Printer.PrinterName =
-                                        ConfigurationManager.AppSettings["Printer1"].ToString();
+                                    //fileName = ReportHelper.GetTemplateNameD("X247 后部左侧前轮眉");
+                                    //report.LoadFromFile(fileName);
+
+                                    //report.Printer.PrinterName =
+                                    //    ConfigurationManager.AppSettings["Printer1"].ToString();
+                                    //GetHeadTable = _recordBLL.GetLMX247HLF;
+
+                                    //SetPrintInfo(ref fileName, "轮眉", report, "Printer1", _recordBLL.GetLMX247HLF);
+                                    UtilityHelper.SetPrintInfo(ref fileName, "轮眉247", report, "Printer1");
+                                    GetHeadTable = _recordBLL.GetLMX247HLF;
                                 }
 
                                 if (partNo == "1230002621")
                                 {
                                     md.PartType = "X247 后部右侧前轮眉";
-
                                     type = 5;
+                                    //fileName = ReportHelper.GetTemplateNameD("X247 后部右侧前轮眉");
 
-                                    report.LoadFromFile(@"D:\X247 后部右侧前轮眉.grf");
+                                    //report.LoadFromFile(fileName);
 
-                                    report.Printer.PrinterName =
-                                        ConfigurationManager.AppSettings["Printer1"].ToString();
+                                    //report.Printer.PrinterName =
+                                    //    ConfigurationManager.AppSettings["Printer1"].ToString();
+                                    //GetHeadTable = _recordBLL.GetLMX247HRF;
+
+                                    //SetPrintInfo(ref fileName, "轮眉", report, "Printer1", _recordBLL.GetLMX247HRF);
+
+                                    UtilityHelper.SetPrintInfo(ref fileName, "轮眉247", report, "Printer1");
+                                    GetHeadTable = _recordBLL.GetLMX247HRF;
                                 }
 
                                 #endregion
@@ -343,9 +386,8 @@ namespace PurchingMistakeNew
 
                                 #region 打印总成条码
 
-                                report.Register("");
-                                report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
-                                report.Print(false);
+                                //Print(report, fileName, partNo, GetHeadTable());
+                                UtilityHelper.Print(report, fileName, partNo, GetHeadTable());
                                 abll.UpdateInfo(md);
 
                                 #endregion
@@ -487,56 +529,79 @@ namespace PurchingMistakeNew
                     part = textBox3.Text.Trim().Substring(0, textBox3.Text.Trim().IndexOf("."));
 
                     #region 轮眉
-
+                    string fileName = string.Empty;
                     if (part == "A2478850022")
                     {
                         md.PartType = "X247 前部左侧轮眉";
-                        report.LoadFromFile(@"D:\X247 前部左侧轮眉.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                        //report.LoadFromFile(@"D:\X247 前部左侧轮眉.grf");
+                        //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+
+                       // SetPrintInfo(ref fileName, "轮眉", report, "Printer1", null);
+
+                        UtilityHelper.SetPrintInfo(ref fileName, "轮眉247", report, "Printer1");
+                      
                     }
 
                     if (part == "A2478850222")
                     {
                         md.PartType = "X247 后部左侧后轮眉";
-                        report.LoadFromFile(@"D:\X247 后部左侧后轮眉.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                        //report.LoadFromFile(@"D:\X247 后部左侧后轮眉.grf");
+                        //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+
+                        //SetPrintInfo(ref fileName, "轮眉", report, "Printer1", null);
+                        UtilityHelper.SetPrintInfo(ref fileName, "轮眉247", report, "Printer1");
                     }
 
                     if (part == "A2478850122")
                     {
                         md.PartType = "X247 前部右侧轮眉";
-                        report.LoadFromFile(@"D:\X247 前部右侧轮眉.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                        //report.LoadFromFile(@"D:\X247 前部右侧轮眉.grf");
+                        //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+
+                        //SetPrintInfo(ref fileName, "轮眉", report, "Printer2", null);
+                        UtilityHelper.SetPrintInfo(ref fileName, "轮眉247", report, "Printer2");
                     }
 
                     if (part == "A2478850322")
                     {
                         md.PartType = "X247 右侧后部后轮眉";
-                        report.LoadFromFile(@"D:\X247 右侧后部后轮眉.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                        //report.LoadFromFile(@"D:\X247 右侧后部后轮眉.grf");
+                        //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+
+                        //SetPrintInfo(ref fileName, "轮眉", report, "Printer2", null);
+                        UtilityHelper.SetPrintInfo(ref fileName, "轮眉247", report, "Printer2");
                     }
 
                     if (part == "A2477309400")
                     {
                         md.PartType = "X247 后部左侧前轮眉";
-                        report.LoadFromFile(@"D:\X247 后部左侧轮眉.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                        //report.LoadFromFile(@"D:\X247 后部左侧轮眉.grf");
+                        //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+
+                        //SetPrintInfo(ref fileName, "轮眉", report, "Printer1", null);
+                        UtilityHelper.SetPrintInfo(ref fileName, "轮眉247", report, "Printer1");
                     }
 
                     if (part == "A2477309600")
                     {
                         md.PartType = "X247 后部右侧前轮眉";
-                        report.LoadFromFile(@"D:\X247 后部右侧前轮眉.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                        //report.LoadFromFile(@"D:\X247 后部右侧前轮眉.grf");
+                        //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+
+                        //SetPrintInfo(ref fileName, "轮眉", report, "Printer2", null);
+                        UtilityHelper.SetPrintInfo(ref fileName, "轮眉247", report, "Printer2");
                     }
 
                     #endregion
 
                     #endregion
 
-                    report.Register("");
-                    report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
-                    report.Print(false);
+                    //report.Register("");
+                    //report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
+                    //report.Print(false);
+
+                    //Print(report, fileName, part, dt);
+                    UtilityHelper.Print(report, fileName, part, dt);
                     bll.UpdateInfo(md);
                 }
                 else
@@ -632,5 +697,49 @@ namespace PurchingMistakeNew
 
             return false;
         }
+        //void SetPrintInfo(ref string fileName, string printType, GridppReport report, string printerName, Func<DataTable> getData)
+        //{
+        //    if (printType == "门板")
+        //    {
+        //        fileName = ReportHelper.GetTemplateDoor();
+        //    }
+        //    else if (printType == "轮眉")
+        //    {
+        //        fileName = ReportHelper.GetTemplateWheelBrow247();
+        //    }
+        //    else if (printType == "扰流板")
+        //    {
+        //        fileName = ReportHelper.GetTemplateSpoiler();
+        //    }
+
+        //    report.LoadFromFile(fileName);
+        //    report.Printer.PrinterName = ConfigurationManager.AppSettings[printerName].ToString();
+        //    GetHeadTable = getData;
+        //}
+
+        //void Print(GridppReport report, string fileName, string part, DataTable assembleTable)
+        //{
+        //    DataTable headTable = null;
+        //    if (string.IsNullOrEmpty(fileName))
+        //    {
+        //        report.Register("");
+        //        report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
+        //        report.Print(false);
+        //    }
+        //    else
+        //    {
+        //        headTable = assembleTable;
+        //        headTable.Columns.Add("QLevel");
+        //        foreach (DataRow dr in headTable.Rows)
+        //        {
+        //            string qlevel = _recordBLL.SearchQLevelFromWms("", part);
+        //            dr["QLevel"] = qlevel;
+        //        }
+
+        //        ReportHelper report2 = new ReportHelper(fileName, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, report.Printer.PrinterName);
+        //        report2.Report.Printer.PrinterName = report.Printer.PrinterName;
+        //        report2.Report.Print(false);
+        //    }
+        //}
     }
 }
diff --git a/PurchingMistakeNew/Form5.cs b/PurchingMistakeNew/Form5.cs
index bd44db3..ffb5ca4 100644
--- a/PurchingMistakeNew/Form5.cs
+++ b/PurchingMistakeNew/Form5.cs
@@ -18,6 +18,9 @@ namespace PurchingMistakeNew
 {
     public partial class Form5 : Form
     {
+        private Func<DataTable> GetHeadTable = null;
+        private BoxBLL _boxBll = new BoxBLL();
+        private RecordBLL _recordBLL = new RecordBLL();
         public Form5()
         {
             InitializeComponent();
@@ -141,7 +144,8 @@ namespace PurchingMistakeNew
                         box = "";
 
                     }
-
+                    DataTable headTable = null;
+                    string fileName = string.Empty;
                     batch = DateTime.Now.ToString("yyyy-MM-dd").Substring(2, 2) + DateTime.Now.ToString("yyyy-MM-dd").Substring(5, 2) + DateTime.Now.ToString("yyyy-MM-dd").Substring(8, 2);
                     if (box != "")
                     {
@@ -215,42 +219,46 @@ namespace PurchingMistakeNew
                             //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
                             //} 
                             #endregion
+                            string moudleType = string.Empty;//例如 后左
+                            string partType = string.Empty;//例如 门板,轮眉
+                            string carType = string.Empty; //车型 X247  H247等
+                            SetPrintInfo(part, report, ref fileName, ref moudleType, ref partType, ref carType);
 
-                            if (part == "A2478850022")
-                            {
-                                report.LoadFromFile(@"D:\X247 前部左侧轮眉装箱单.grf");
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                            }
+                            //if (part == "A2478850022")
+                            //{
+                            //    report.LoadFromFile(@"D:\X247 前部左侧轮眉装箱单.grf");
+                            //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                            //}
 
-                            if (part == "A2478850222")
-                            {
-                                report.LoadFromFile(@"D:\X247 后部左侧轮眉装箱单.grf");
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                            }
+                            //if (part == "A2478850222")
+                            //{
+                            //    report.LoadFromFile(@"D:\X247 后部左侧轮眉装箱单.grf");
+                            //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                            //}
 
-                            if (part == "A2478850122")
-                            {
-                                report.LoadFromFile(@"D:\X247 前部右侧轮眉装箱单.grf");
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                            }
+                            //if (part == "A2478850122")
+                            //{
+                            //    report.LoadFromFile(@"D:\X247 前部右侧轮眉装箱单.grf");
+                            //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                            //}
 
-                            if (part == "A2478850322")
-                            {
-                                report.LoadFromFile(@"D:\X247 后部右侧后轮眉装箱单.grf");
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                            }
+                            //if (part == "A2478850322")
+                            //{
+                            //    report.LoadFromFile(@"D:\X247 后部右侧后轮眉装箱单.grf");
+                            //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                            //}
 
-                            if (part == "A2477309400")
-                            {
-                                report.LoadFromFile(@"D:\X247 后部左侧前轮眉装箱单.grf");
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                            }
+                            //if (part == "A2477309400")
+                            //{
+                            //    report.LoadFromFile(@"D:\X247 后部左侧前轮眉装箱单.grf");
+                            //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                            //}
 
-                            if (part == "A2477309600")
-                            {
-                                report.LoadFromFile(@"D:\X247 后部右侧前轮眉装箱单.grf");
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                            }
+                            //if (part == "A2477309600")
+                            //{
+                            //    report.LoadFromFile(@"D:\X247 后部右侧前轮眉装箱单.grf");
+                            //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                            //}
 
                             #region 注释掉
 
@@ -269,10 +277,12 @@ namespace PurchingMistakeNew
 
                             #endregion
 
-                            report.Register("");
-                            report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
-                            report.Print(false);
+                            //report.Register("");
+                            //report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
+                            //report.Print(false);
 
+                            //Print(report, fileName, part);
+                            UtilityHelper.PrintBox(report, fileName, part, moudleType, partType, carType, GetHeadTable);
                             bll.UpdateInfo(md);
 
                             #endregion
@@ -329,42 +339,46 @@ namespace PurchingMistakeNew
                             //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
                             //} 
                             #endregion
+                            string moudleType = string.Empty;//例如 后左
+                            string partType = string.Empty;//例如 门板,轮眉
+                            string carType = string.Empty; //车型 X247  H247等
+                            SetPrintInfo(part, report, ref fileName, ref moudleType, ref partType, ref carType);
 
-                            if (part == "A2478850022")
-                            {
-                                report.LoadFromFile(@"D:\X247 前部左侧轮眉装箱单.grf");
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                            }
+                            //if (part == "A2478850022")
+                            //{
+                            //    report.LoadFromFile(@"D:\X247 前部左侧轮眉装箱单.grf");
+                            //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                            //}
 
-                            if (part == "A2478850222")
-                            {
-                                report.LoadFromFile(@"D:\X247 后部左侧轮眉装箱单.grf");
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                            }
+                            //if (part == "A2478850222")
+                            //{
+                            //    report.LoadFromFile(@"D:\X247 后部左侧轮眉装箱单.grf");
+                            //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                            //}
 
-                            if (part == "A2478850122")
-                            {
-                                report.LoadFromFile(@"D:\X247 前部右侧轮眉装箱单.grf");
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                            }
+                            //if (part == "A2478850122")
+                            //{
+                            //    report.LoadFromFile(@"D:\X247 前部右侧轮眉装箱单.grf");
+                            //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                            //}
 
-                            if (part == "A2478850322")
-                            {
-                                report.LoadFromFile(@"D:\X247 后部右侧后轮眉装箱单.grf");
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                            }
+                            //if (part == "A2478850322")
+                            //{
+                            //    report.LoadFromFile(@"D:\X247 后部右侧后轮眉装箱单.grf");
+                            //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                            //}
 
-                            if (part == "A2477309400")
-                            {
-                                report.LoadFromFile(@"D:\X247 后部左侧前轮眉装箱单.grf");
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                            }
+                            //if (part == "A2477309400")
+                            //{
+                            //    report.LoadFromFile(@"D:\X247 后部左侧前轮眉装箱单.grf");
+                            //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                            //}
 
-                            if (part == "A2477309600")
-                            {
-                                report.LoadFromFile(@"D:\X247 后部右侧前轮眉装箱单.grf");
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                            }
+                            //if (part == "A2477309600")
+                            //{
+                            //    report.LoadFromFile(@"D:\X247 后部右侧前轮眉装箱单.grf");
+                            //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                            //}
 
                             #region 注释掉
                             //if (part == "A2477900788" || part == "A2477901300")
@@ -382,10 +396,12 @@ namespace PurchingMistakeNew
 
                             #endregion
 
-                            report.Register("");
-                            report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
-                            report.Print(false);
+                            //report.Register("");
+                            //report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
+                            //report.Print(false);
 
+                            //Print(report, fileName, part);
+                            UtilityHelper.PrintBox(report, fileName, part, moudleType, partType, carType, GetHeadTable);
                             bll.UpdateInfo(md);
 
                             #endregion
@@ -704,7 +720,8 @@ namespace PurchingMistakeNew
                     textBox3.Focus();
                     return;
                 }
-
+                DataTable headTable = null;
+                string fileName = string.Empty;
                 DataTable dt = bll.SearchBoxIsExsit(textBox3.Text.Trim());
                 if (dt != null && dt.Rows.Count > 0)
                 {
@@ -727,67 +744,71 @@ namespace PurchingMistakeNew
                     #region 打印装箱单
 
                     #region 注释掉
-                    if (part == "A2477209103" || part == "A2477209203" || part == "A2477209305" || part == "A2477204606" || part == "A2477204806" || part == "A2477205006")
-                    {
-                        report.LoadFromFile(@"D:\X247 左侧前门板装箱单.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                    }
+                    //if (part == "A2477209103" || part == "A2477209203" || part == "A2477209305" || part == "A2477204606" || part == "A2477204806" || part == "A2477205006")
+                    //{
+                    //    report.LoadFromFile(@"D:\X247 左侧前门板装箱单.grf");
+                    //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                    //}
 
 
-                    if (part == "A2477309401" || part == "A2477309501" || part == "A2477300203" || part == "A2477305303" || part == "A2477305503" || part == "A2477305703")
-                    {
-                        report.LoadFromFile(@"D:\X247 左侧后门板装箱单.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                    }
+                    //if (part == "A2477309401" || part == "A2477309501" || part == "A2477300203" || part == "A2477305303" || part == "A2477305503" || part == "A2477305703")
+                    //{
+                    //    report.LoadFromFile(@"D:\X247 左侧后门板装箱单.grf");
+                    //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                    //}
 
-                    if (part == "A2477209303" || part == "A2477209403" || part == "A2477207505" || part == "A2477204706" || part == "A2477204906" || part == "A2477205106")
-                    {
-                        report.LoadFromFile(@"D:\X247 右侧前门板装箱单.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                    }
+                    //if (part == "A2477209303" || part == "A2477209403" || part == "A2477207505" || part == "A2477204706" || part == "A2477204906" || part == "A2477205106")
+                    //{
+                    //    report.LoadFromFile(@"D:\X247 右侧前门板装箱单.grf");
+                    //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                    //}
 
-                    if (part == "A2477309601" || part == "A2477309701" || part == "A2477300303" || part == "A2477305403" || part == "A2477305603" || part == "A2477305803")
-                    {
-                        report.LoadFromFile(@"D:\X247 右侧后门板装箱单.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                    } 
+                    //if (part == "A2477309601" || part == "A2477309701" || part == "A2477300303" || part == "A2477305403" || part == "A2477305603" || part == "A2477305803")
+                    //{
+                    //    report.LoadFromFile(@"D:\X247 右侧后门板装箱单.grf");
+                    //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                    //}
                     #endregion
+                    string moudleType = string.Empty;//例如 后左
+                    string partType = string.Empty;//例如 门板,轮眉
+                    string carType = string.Empty; //车型 X247  H247等
+                    SetPrintInfo(part, report, ref fileName, ref moudleType, ref partType, ref carType);
 
-                    if (part == "A2478850022")
-                    {
-                        report.LoadFromFile(@"D:\X247 前部左侧轮眉装箱单.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                    }
+                    //if (part == "A2478850022")
+                    //{
+                    //    report.LoadFromFile(@"D:\X247 前部左侧轮眉装箱单.grf");
+                    //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                    //}
 
-                    if (part == "A2478850222")
-                    {
-                        report.LoadFromFile(@"D:\X247 后部左侧轮眉装箱单.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                    }
+                    //if (part == "A2478850222")
+                    //{
+                    //    report.LoadFromFile(@"D:\X247 后部左侧轮眉装箱单.grf");
+                    //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                    //}
 
-                    if (part == "A2478850122")
-                    {
-                        report.LoadFromFile(@"D:\X247 前部右侧轮眉装箱单.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                    }
+                    //if (part == "A2478850122")
+                    //{
+                    //    report.LoadFromFile(@"D:\X247 前部右侧轮眉装箱单.grf");
+                    //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                    //}
 
-                    if (part == "A2478850322")
-                    {
-                        report.LoadFromFile(@"D:\X247 后部右侧后轮眉装箱单.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                    }
+                    //if (part == "A2478850322")
+                    //{
+                    //    report.LoadFromFile(@"D:\X247 后部右侧后轮眉装箱单.grf");
+                    //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                    //}
 
-                    if (part == "A2477309400")
-                    {
-                        report.LoadFromFile(@"D:\X247 后部左侧前轮眉装箱单.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                    }
+                    //if (part == "A2477309400")
+                    //{
+                    //    report.LoadFromFile(@"D:\X247 后部左侧前轮眉装箱单.grf");
+                    //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                    //}
 
-                    if (part == "A2477309600")
-                    {
-                        report.LoadFromFile(@"D:\X247 后部右侧前轮眉装箱单.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                    }
+                    //if (part == "A2477309600")
+                    //{
+                    //    report.LoadFromFile(@"D:\X247 后部右侧前轮眉装箱单.grf");
+                    //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                    //}
 
                     #region 注释掉
                     //if (part == "A2477900788" || part == "A2477901300")
@@ -805,9 +826,12 @@ namespace PurchingMistakeNew
 
                     #endregion
 
-                    report.Register("");
-                    report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
-                    report.Print(false);
+                    //report.Register("");
+                    //report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
+                    //report.Print(false);
+
+                    //Print(report, fileName, part);
+                    UtilityHelper.PrintBox(report, fileName, part, moudleType, partType, carType, GetHeadTable);
 
                     bll.UpdateInfo(md);
                 }
@@ -824,6 +848,142 @@ namespace PurchingMistakeNew
                 LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
             }
         }
+        //void Print(GridppReport report, string fileName, string part)
+        //{
+        //    DataTable headTable = null;
+        //    if (string.IsNullOrEmpty(fileName))
+        //    {
+        //        report.Register("");
+        //        report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
+        //        report.Print(false);
+        //    }
+        //    else
+        //    {
+        //        headTable = GetHeadTable();
+        //        headTable.Columns.Add("QLevel");
+        //        foreach (DataRow dr in headTable.Rows)
+        //        {
+        //            string qlevel = _recordBLL.SearchQLevelFromWms("", part);
+        //            dr["QLevel"] = qlevel;
+        //        }
+
+        //        ReportHelper report2 = new ReportHelper(fileName, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, report.Printer.PrinterName);
+        //        report2.Report.Printer.PrinterName = report.Printer.PrinterName;
+        //        report2.Report.Print(false);
+        //    }
+        //}
+        /// <summary>
+        /// 设置打印信息
+        /// </summary>
+        /// <param name="part"></param>
+        /// <param name="report"></param>
+        /// <param name="fileName"></param>
+        void SetPrintInfo(string part, GridppReport report, ref string fileName, ref string moudleType, ref string partType, ref string carType)
+        {
+
+            if (part == "A2478850022")
+            {
+                //report.LoadFromFile(@"D:\X247 前部左侧轮眉装箱单.grf");
+                //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+
+                moudleType = "前左";
+                partType = "轮眉";
+                carType = "X247";
+                UtilityHelper.SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer1", true);
+                GetHeadTable = _boxBll.GetX247LF_LM;
+                //SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer1", _boxBll.GetX247LF_LM);
+            }
+
+            if (part == "A2478850222")
+            {
+                //report.LoadFromFile(@"D:\X247 后部左侧轮眉装箱单.grf");
+                //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                moudleType = "后左";
+                partType = "轮眉";
+                carType = "X247";
+                UtilityHelper.SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer1", true);
+                GetHeadTable = _boxBll.GetX247LR_LM;
+                //SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer1", _boxBll.GetX247LR_LM);
+            }
+
+            if (part == "A2478850122")
+            {
+                //report.LoadFromFile(@"D:\X247 前部右侧轮眉装箱单.grf");
+                //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+
+                moudleType = "前右";
+                partType = "轮眉";
+                carType = "X247";
+                UtilityHelper.SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer2", true);
+                GetHeadTable = _boxBll.GetX247RF_LM;
+                //SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer2", _boxBll.GetX247RF_LM);
+            }
+
+            if (part == "A2478850322")
+            {
+                //report.LoadFromFile(@"D:\X247 后部右侧后轮眉装箱单.grf");
+                //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                moudleType = "后右后";
+                partType = "轮眉";
+                carType = "X247";
+                UtilityHelper.SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer2", true);
+                GetHeadTable = _boxBll.GetX247HRH_LM;
+                //SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer2", _boxBll.GetX247HRH_LM);
+            }
+
+            if (part == "A2477309400")
+            {
+                //report.LoadFromFile(@"D:\X247 后部左侧前轮眉装箱单.grf");
+                //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                moudleType = "后左前";
+                partType = "轮眉";
+                carType = "X247";
+                UtilityHelper.SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer1", true);
+                GetHeadTable = _boxBll.GetX247HLF_LM;
+                //SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer1", _boxBll.GetX247HLF_LM);
+            }
+
+            if (part == "A2477309600")
+            {
+                //report.LoadFromFile(@"D:\X247 后部右侧前轮眉装箱单.grf");
+                //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                moudleType = "后右前";
+                partType = "轮眉";
+                carType = "X247";
+                UtilityHelper.SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer2", true);
+                GetHeadTable = _boxBll.GetX247HRF_LM;
+                //SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer2", _boxBll.GetX247HRF_LM);
+            }
+
+           
+        }
+        //void SetBoxPrintInfo(ref string fileName, string printType, GridppReport report, string printerName, Func<DataTable> getData, bool isSmall = true)
+        //{
+        //    if (printType == "门板")
+        //    {
+        //        fileName = ReportHelper.GetBoxTemplateNameBig();
+        //    }
+        //    else if (printType == "轮眉")
+        //    {
+        //        if (isSmall == false)
+        //        {
+        //            fileName = ReportHelper.GetBoxTemplateNameBig();
+        //        }
+        //        else
+        //        {
+        //            fileName = ReportHelper.GetBoxTemplateNameSmall();
+        //        }
+        //    }
+        //    else if (printType == "扰流板")
+        //    {
+        //        fileName = ReportHelper.GetBoxTemplateNameBig();
+        //    }
+
+        //    report.LoadFromFile(fileName);
+        //    report.Printer.PrinterName = ConfigurationManager.AppSettings[printerName].ToString();
+        //    GetHeadTable = getData;
+
+        //}
 
         private void button4_Click(object sender, EventArgs e)
         {
diff --git a/PurchingMistakeNew/Form6.cs b/PurchingMistakeNew/Form6.cs
index fd32f5f..7b42117 100644
--- a/PurchingMistakeNew/Form6.cs
+++ b/PurchingMistakeNew/Form6.cs
@@ -18,6 +18,8 @@ namespace PurchingMistakeNew
 {
     public partial class Form6 : Form
     {
+        private RecordBLL _recordBLL = new RecordBLL();
+        private Func<DataTable> GetHeadTable = null;
         public Form6()
         {
             InitializeComponent();
@@ -177,6 +179,20 @@ namespace PurchingMistakeNew
 
                     #endregion
 
+                    //wrx 250319半成品塑件条码是否重复的验证, 只验证20位塑件码. 因为库中有一张很长的码是重复的,特殊情况
+                    if (textBox2.Text.Trim().Length == 20)
+                    {
+                        DataTable recorddt = rbll.SearchByPartNo1(textBox2.Text.Trim());
+                        if (recorddt != null && recorddt.Rows.Count > 0)
+                        {
+                            MessageBox.Show("此半成品已装配过！", "提示", MessageBoxButtons.OK);
+                            textBox2.Focus();
+                            return;
+                        }
+                    }
+
+
+
                     deviceNo = textBox1.Text.Trim();
                     partNo = textBox2.Text.Substring(0, 10);
 
@@ -187,7 +203,8 @@ namespace PurchingMistakeNew
                     if (dt != null && dt.Rows.Count > 0)
                     {
                         #region 根据半成品查找总成零件号
-
+                        DataTable headTable = null;
+                        string fileName = string.Empty;
                         DataTable dt2 = bll.SearchByNo(partNo, deviceNo);
                         if (dt2 != null && dt2.Rows.Count > 0)
                         {
@@ -273,20 +290,26 @@ namespace PurchingMistakeNew
                                 md.PartType = "X247 后部左侧前轮眉";
 
                                 type = 5;
-                                report.LoadFromFile(@"D:\X247 后部左侧前轮眉.grf");
+                                //report.LoadFromFile(@"D:\X247 后部左侧前轮眉.grf");
+
+                                //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
 
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                                //SetPrintInfo(ref fileName, "轮眉", report, "Printer1", _recordBLL.GetLMX247HLF);
+                                UtilityHelper.SetPrintInfo(ref fileName, "轮眉247", report, "Printer1");
+                                GetHeadTable = _recordBLL.GetLMX247HLF;
                             }
 
                             if (partNo == "1230002621")
                             {
                                 md.PartType = "X247 后部右侧前轮眉";
-
                                 type = 5;
 
-                                report.LoadFromFile(@"D:\X247 后部右侧前轮眉.grf");
+                                //report.LoadFromFile(@"D:\X247 后部右侧前轮眉.grf");
+                                //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
 
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                                //SetPrintInfo(ref fileName, "轮眉", report, "Printer2", _recordBLL.GetLMX247HRF);
+                                UtilityHelper.SetPrintInfo(ref fileName, "轮眉247", report, "Printer2");
+                                GetHeadTable = _recordBLL.GetLMX247HRF;
                             }
 
                             
@@ -305,9 +328,13 @@ namespace PurchingMistakeNew
 
                             #region 打印总成条码
 
-                            report.Register("");
-                            report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
-                            report.Print(false);
+                            //report.Register("");
+                            //report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
+                            //report.Print(false);
+
+                           // Print(report, fileName, partNo, GetHeadTable());
+                            UtilityHelper.Print(report, fileName, partNo, GetHeadTable());
+
                             abll.UpdateInfo(md);
 
                             #endregion
@@ -395,27 +422,39 @@ namespace PurchingMistakeNew
                     bll.AddInfo(md);
 
                     part = textBox3.Text.Trim().Substring(0, textBox3.Text.Trim().IndexOf("."));
-
+                    string fileName = string.Empty;
                     if (part == "A2477309400")
                     {
                         md.PartType = "X247 后部左侧前轮眉";
+                       
                         //report.LoadFromFile(@"D:\X247 后部左侧轮眉.grf");
-                        report.LoadFromFile(@"D:\X247 后部左侧前轮眉.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                        //report.LoadFromFile(@"D:\X247 后部左侧前轮眉.grf");
+                        //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+
+                        //SetPrintInfo(ref fileName, "轮眉", report, "Printer1", null);
+                        UtilityHelper.SetPrintInfo(ref fileName, "轮眉247", report, "Printer1"); 
                     }
 
                     if (part == "A2477309600")
                     {
                         md.PartType = "X247 后部右侧前轮眉";
-                        report.LoadFromFile(@"D:\X247 后部右侧前轮眉.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                        
+                        //report.LoadFromFile(@"D:\X247 后部右侧前轮眉.grf");
+                        //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+
+                        //SetPrintInfo(ref fileName, "轮眉", report, "Printer2", null);
+                        UtilityHelper.SetPrintInfo(ref fileName, "轮眉247", report, "Printer2");
                     }
 
                     #endregion
 
-                    report.Register("");
-                    report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
-                    report.Print(false);
+                    //report.Register("");
+                    //report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
+                    //report.Print(false);
+
+                    //Print(report, fileName, md.PartNo, dt);
+                    UtilityHelper.Print(report, fileName, md.PartNo, dt);
+
                     bll.UpdateInfo(md);
 
 
@@ -512,5 +551,52 @@ namespace PurchingMistakeNew
 
             return false;
         }
-    }
+    
+    //void SetPrintInfo(ref string fileName, string printType, GridppReport report, string printerName, Func<DataTable> getData)
+    //{
+    //    if (printType == "门板")
+    //    {
+    //        fileName = ReportHelper.GetTemplateDoor();
+    //    }
+    //    else if (printType == "轮眉")
+    //    {
+    //        fileName = ReportHelper.GetTemplateWheelBrow247();
+    //    }
+    //    else if (printType == "扰流板")
+    //    {
+    //        fileName = ReportHelper.GetTemplateSpoiler();
+    //    }
+    //    else if (printType == "轮眉X243")
+    //    {
+    //        fileName = ReportHelper.GetTemplateWheelBrow243();
+    //    }
+    //    report.LoadFromFile(fileName);
+    //    report.Printer.PrinterName = ConfigurationManager.AppSettings[printerName].ToString();
+    //    GetHeadTable = getData;
+    //}
+    //void Print(GridppReport report, string fileName, string part, DataTable assembleTable)
+    //{
+    //    DataTable headTable = null;
+    //    if (string.IsNullOrEmpty(fileName))
+    //    {
+    //        report.Register("");
+    //        report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
+    //        report.Print(false);
+    //    }
+    //    else
+    //    {
+    //        headTable = assembleTable;
+    //        headTable.Columns.Add("QLevel");
+    //        foreach (DataRow dr in headTable.Rows)
+    //        {
+    //            string qlevel = _recordBLL.SearchQLevelFromWms("", part);
+    //            dr["QLevel"] = qlevel;
+    //        }
+
+    //        ReportHelper report2 = new ReportHelper(fileName, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, report.Printer.PrinterName);
+    //        report2.Report.Printer.PrinterName = report.Printer.PrinterName;
+    //        report2.Report.Print(false);
+    //    }
+    //}
+}
 }
diff --git a/PurchingMistakeNew/Form7.cs b/PurchingMistakeNew/Form7.cs
index 976bb62..d0621c0 100644
--- a/PurchingMistakeNew/Form7.cs
+++ b/PurchingMistakeNew/Form7.cs
@@ -258,6 +258,10 @@ namespace PurchingMistakeNew
 
                     #region 判断计划单里是否有此产品的生产计划并且是未完成
 
+                   
+                   
+
+
                     DataTable hdt = pbll.IsHavePlan(textBox2.Text.Trim().Substring(0, 10), textBox4.Text.Trim());
                     if (hdt != null && hdt.Rows.Count > 0)
                     {
@@ -271,6 +275,19 @@ namespace PurchingMistakeNew
                         return;
                     }
 
+
+                    //wrx 250319半成品塑件条码是否重复的验证, 只验证20位塑件码. 因为库中有一张很长的码是重复的,特殊情况
+                    if (textBox2.Text.Trim().Length == 20)
+                    {
+                        DataTable recorddt = rbll.SearchByPartNo1(textBox2.Text.Trim());
+                        if (recorddt != null && recorddt.Rows.Count > 0)
+                        {
+                            MessageBox.Show("此半成品已装配过！", "提示", MessageBoxButtons.OK);
+                            textBox2.Focus();
+                            return;
+                        }
+                    }
+
                     #endregion
 
                     deviceNo = textBox1.Text.Trim();
@@ -336,14 +353,12 @@ namespace PurchingMistakeNew
                             if (partNo == "1230002627")
                             {
                                 md.PartType = "X247 后部左侧扰流板";
-
                                 type = 6;
                             }
 
                             if (partNo == "1230002600")
                             {
                                 md.PartType = "X247 后部右侧扰流板";
-
                                 type = 7;
                             }
 
@@ -642,7 +657,7 @@ namespace PurchingMistakeNew
                 #endregion
 
                 #region 根据半成品零件号判断总成类型、总成条码模板、打印机
-
+                
                 if (partNo == "A2477901300")
                 {
                     md.PartType = "X247 后部左侧扰流板";
@@ -681,8 +696,8 @@ namespace PurchingMistakeNew
                 #endregion
 
                 #region 打印总成条码
-
-                filename = Application.StartupPath + @"\11.grf";
+                filename = ReportHelper.GetTemplateSpoiler();
+                //filename = Application.StartupPath + @"\11.grf";
 
                 //report.Register("");
                 //report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
@@ -691,10 +706,27 @@ namespace PurchingMistakeNew
                 headTable.Columns.Add("PartNo");
                 headTable.Columns.Add("PartName");
                 headTable.Columns.Add("BatchNo");
+                headTable.Columns.Add("QLevel");
+               // headTable.Columns.Add("ValidityDate");
+
                 DataRow row = headTable.NewRow();
                 row["PartNo"] = no;
                 row["PartName"] = name;
                 row["BatchNo"] = batchNo;
+               // row["ValidityDate"] = batchNo;
+
+                string simplePart = string.Empty;
+                if (!string.IsNullOrEmpty(no))
+                {
+                    int i = no.IndexOf('.');
+                    if (i > 0)
+                    {
+                        simplePart = no.Substring(0, i);
+                    }
+                }
+                string qlevel = UtilityHelper. GetQLevel(simplePart);
+                row["QLevel"] = qlevel;
+               
                 headTable.Rows.Add(row);
                 //MyReport6 rp = new MyReport6(filename, headTable, null);
                 //rp.Report.Printer.PrinterName = PrinterName;
@@ -704,8 +736,9 @@ namespace PurchingMistakeNew
                 //report.Print(false);
 
                 ReportHelper rp = new ReportHelper(filename, headTable, null,
-                    (int)GRPaperOrientation.grpoDefault, 1, PrinterName);
+                    (int)GRPaperOrientation.grpoPortrait, 1, PrinterName);
                 rp.Report.Print(false);
+
                 //report.Register("");
                 //report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
                 abll.UpdatePrintByID(id);
diff --git a/PurchingMistakeNew/Form8.cs b/PurchingMistakeNew/Form8.cs
index ebfff5e..76f6fda 100644
--- a/PurchingMistakeNew/Form8.cs
+++ b/PurchingMistakeNew/Form8.cs
@@ -18,6 +18,9 @@ namespace PurchingMistakeNew
 {
     public partial class Form8 : Form
     {
+        private Func<DataTable> GetHeadTable = null;
+        private BoxBLL _boxBll = new BoxBLL();
+        private RecordBLL _recordBLL = new RecordBLL();
         public Form8()
         {
             InitializeComponent();
@@ -118,7 +121,8 @@ namespace PurchingMistakeNew
                     {
                         box = "";
                     }
-
+                    DataTable headTable = null;
+                    string fileName = string.Empty;
                     batch = DateTime.Now.ToString("yyyy-MM-dd").Substring(2, 2) + DateTime.Now.ToString("yyyy-MM-dd").Substring(5, 2) + DateTime.Now.ToString("yyyy-MM-dd").Substring(8, 2);
                     if (box != "")
                     {
@@ -165,37 +169,39 @@ namespace PurchingMistakeNew
                             bll.AddInfo(md);
 
                             #region 打印装箱单
-
-                            if (part == "A2477901300")
-                            {
-                                report.LoadFromFile(@"D:\X247 后部左侧扰流板装箱单.grf");
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                            }
-
-                            if (part == "A2477901400")
-                            {
-                                report.LoadFromFile(@"D:\X247 后部右侧扰流板装箱单.grf");
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                            }
-
-                            if (part == "A2477900300")
-                            {
-                                report.LoadFromFile(@"D:\H247 后部左侧扰流板装箱单.grf");
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                            }
-
-                            if (part == "A2477900400")
-                            {
-                                report.LoadFromFile(@"D:\H247 后部右侧扰流板装箱单.grf");
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                            }
+                            string moudleType = string.Empty;//例如 后左
+                            string partType = string.Empty;//例如 门板,轮眉
+                            string carType = string.Empty; //车型 X247  H247等
+                            SetPrintInfo(part, report, ref fileName, ref moudleType, ref partType, ref carType);
+
+                            //if (part == "A2477901300")
+                            //{
+                            //    report.LoadFromFile(@"D:\X247 后部左侧扰流板装箱单.grf");
+                            //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                            //}
+
+                            //if (part == "A2477901400")
+                            //{
+                            //    report.LoadFromFile(@"D:\X247 后部右侧扰流板装箱单.grf");
+                            //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                            //}
+
+                            //if (part == "A2477900300")
+                            //{
+                            //    report.LoadFromFile(@"D:\H247 后部左侧扰流板装箱单.grf");
+                            //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                            //}
+
+                            //if (part == "A2477900400")
+                            //{
+                            //    report.LoadFromFile(@"D:\H247 后部右侧扰流板装箱单.grf");
+                            //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                            //}
 
                             #endregion
 
-                            report.Register("");
-                            report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
-                            report.Print(false);
-
+                            //Print(report, fileName, part);
+                            UtilityHelper.PrintBox(report, fileName, part, moudleType, partType, carType, GetHeadTable);
                             bll.UpdateInfo(md);
 
                             #endregion
@@ -225,37 +231,43 @@ namespace PurchingMistakeNew
                             bll.AddInfo(md);
 
                             #region 打印装箱单
-
-                            if (part == "A2477901300")
-                            {
-                                report.LoadFromFile(@"D:\X247 后部左侧扰流板装箱单.grf");
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                            }
-
-                            if (part == "A2477901400")
-                            {
-                                report.LoadFromFile(@"D:\X247 后部右侧扰流板装箱单.grf");
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                            }
-
-                            if (part == "A2477900300")
-                            {
-                                report.LoadFromFile(@"D:\H247 后部左侧扰流板装箱单.grf");
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                            }
-
-                            if (part == "A2477900400")
-                            {
-                                report.LoadFromFile(@"D:\H247 后部右侧扰流板装箱单.grf");
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                            }
+                            string moudleType = string.Empty;//例如 后左
+                            string partType = string.Empty;//例如 门板,轮眉
+                            string carType = string.Empty; //车型 X247  H247等
+                            SetPrintInfo(part, report, ref fileName, ref moudleType, ref partType, ref carType);
+
+                            //if (part == "A2477901300")
+                            //{
+                            //    report.LoadFromFile(@"D:\X247 后部左侧扰流板装箱单.grf");
+                            //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                            //}
+
+                            //if (part == "A2477901400")
+                            //{
+                            //    report.LoadFromFile(@"D:\X247 后部右侧扰流板装箱单.grf");
+                            //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                            //}
+
+                            //if (part == "A2477900300")
+                            //{
+                            //    report.LoadFromFile(@"D:\H247 后部左侧扰流板装箱单.grf");
+                            //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                            //}
+
+                            //if (part == "A2477900400")
+                            //{
+                            //    report.LoadFromFile(@"D:\H247 后部右侧扰流板装箱单.grf");
+                            //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                            //}
 
                             #endregion
 
-                            report.Register("");
-                            report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
-                            report.Print(false);
+                            //report.Register("");
+                            //report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
+                            //report.Print(false);
 
+                            //Print(report, fileName, part);
+                            UtilityHelper.PrintBox(report, fileName, part, moudleType, partType, carType, GetHeadTable);
                             bll.UpdateInfo(md);
 
                             #endregion
@@ -602,7 +614,8 @@ namespace PurchingMistakeNew
                     textBox3.Focus();
                     return;
                 }
-
+                DataTable headTable = null;
+                string fileName = string.Empty;
                 DataTable dt = bll.SearchBoxIsExsit(textBox3.Text.Trim());
                 if (dt != null && dt.Rows.Count > 0)
                 {
@@ -623,37 +636,43 @@ namespace PurchingMistakeNew
                     #endregion
 
                     #region 打印装箱单
+                    string moudleType = string.Empty;//例如 后左
+                    string partType = string.Empty;//例如 门板,轮眉
+                    string carType = string.Empty; //车型 X247  H247等
+                    SetPrintInfo(part, report, ref fileName, ref moudleType, ref partType, ref carType);
+
+                    //if (part == "A2477901300")
+                    //{
+                    //    report.LoadFromFile(@"D:\X247 后部左侧扰流板装箱单.grf");
+                    //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                    //}
+
+                    //if (part == "A2477901400")
+                    //{
+                    //    report.LoadFromFile(@"D:\X247 后部右侧扰流板装箱单.grf");
+                    //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                    //}
+
+                    //if (part == "A2477900300")
+                    //{
+                    //    report.LoadFromFile(@"D:\H247 后部左侧扰流板装箱单.grf");
+                    //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                    //}
+
+                    //if (part == "A2477900400")
+                    //{
+                    //    report.LoadFromFile(@"D:\H247 后部右侧扰流板装箱单.grf");
+                    //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                    //}
 
-                    if (part == "A2477901300")
-                    {
-                        report.LoadFromFile(@"D:\X247 后部左侧扰流板装箱单.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                    }
-
-                    if (part == "A2477901400")
-                    {
-                        report.LoadFromFile(@"D:\X247 后部右侧扰流板装箱单.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                    }
-
-                    if (part == "A2477900300")
-                    {
-                        report.LoadFromFile(@"D:\H247 后部左侧扰流板装箱单.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                    }
-
-                    if (part == "A2477900400")
-                    {
-                        report.LoadFromFile(@"D:\H247 后部右侧扰流板装箱单.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                    }
-                    
                     #endregion
 
-                    report.Register("");
-                    report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
-                    report.Print(false);
+                    //report.Register("");
+                    //report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
+                    //report.Print(false);
 
+                    //Print(report, fileName, part);
+                    UtilityHelper.PrintBox(report, fileName, part, moudleType, partType, carType, GetHeadTable);
                     bll.UpdateInfo(md);
                 }
 
@@ -670,6 +689,115 @@ namespace PurchingMistakeNew
             }
         }
 
+        //void Print(GridppReport report, string fileName, string part)
+        //{
+        //    DataTable headTable = null;
+        //    if (string.IsNullOrEmpty(fileName))
+        //    {
+        //        report.Register("");
+        //        report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
+        //        report.Print(false);
+        //    }
+        //    else
+        //    {
+        //        headTable = GetHeadTable();
+        //        headTable.Columns.Add("QLevel");
+        //        foreach (DataRow dr in headTable.Rows)
+        //        {
+        //            string qlevel = _recordBLL.SearchQLevelFromWms("", part);
+        //            dr["QLevel"] = qlevel;
+        //        }
+
+        //        ReportHelper report2 = new ReportHelper(fileName, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, report.Printer.PrinterName);
+        //        report2.Report.Printer.PrinterName = report.Printer.PrinterName;
+        //        report2.Report.Print(false);
+        //    }
+        //}
+
+        /// <summary>
+        /// 设置打印信息
+        /// </summary>
+        /// <param name="part"></param>
+        /// <param name="report"></param>
+        /// <param name="fileName"></param>
+        void SetPrintInfo(string part, GridppReport report, ref string fileName, ref string moudleType, ref string partType, ref string carType)
+        {
+            if (part == "A2477901300")
+            {
+                //report.LoadFromFile(@"D:\X247 后部左侧扰流板装箱单.grf");
+                //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                moudleType = "后左X";
+                partType = "扰流板";
+                carType = "X247";
+                UtilityHelper.SetBoxPrintInfo(ref fileName, "扰流板", report, "Printer1", true);
+                GetHeadTable = _boxBll.GetX247HL_RLB;
+                //SetBoxPrintInfo(ref fileName, "扰流板", report, "Printer1", _boxBll.GetX247HL_RLB);
+            }
+
+            if (part == "A2477901400")
+            {
+                //report.LoadFromFile(@"D:\X247 后部右侧扰流板装箱单.grf");
+                //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                moudleType = "后右X";
+                partType = "扰流板";
+                carType = "X247";
+                UtilityHelper.SetBoxPrintInfo(ref fileName, "扰流板", report, "Printer2", true);
+                GetHeadTable = _boxBll.GetX247HR_RLB;
+                //SetBoxPrintInfo(ref fileName, "扰流板", report, "Printer2", _boxBll.GetX247HR_RLB);
+            }
+
+            if (part == "A2477900300")
+            {
+                //report.LoadFromFile(@"D:\H247 后部左侧扰流板装箱单.grf");
+                //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                moudleType = "后左H";
+                partType = "扰流板";
+                carType = "H247";
+                UtilityHelper.SetBoxPrintInfo(ref fileName, "扰流板", report, "Printer1", true);
+                GetHeadTable = _boxBll.GetH247HL_RLB;
+                //SetBoxPrintInfo(ref fileName, "扰流板", report, "Printer1", _boxBll.GetH247HL_RLB);
+            }
+
+            if (part == "A2477900400")
+            {
+                //report.LoadFromFile(@"D:\H247 后部右侧扰流板装箱单.grf");
+                //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                moudleType = "后右H";
+                partType = "扰流板";
+                carType = "H247";
+                UtilityHelper.SetBoxPrintInfo(ref fileName, "扰流板", report, "Printer2", true);
+                GetHeadTable = _boxBll.GetH247HR_RLB;
+                //SetBoxPrintInfo(ref fileName, "扰流板", report, "Printer2", _boxBll.GetH247HR_RLB);
+            }
+
+        }
+        //void SetBoxPrintInfo(ref string fileName, string printType, GridppReport report, string printerName, Func<DataTable> getData, bool isSmall = true)
+        //{
+        //    if (printType == "门板")
+        //    {
+        //        fileName = ReportHelper.GetBoxTemplateNameBig();
+        //    }
+        //    else if (printType == "轮眉")
+        //    {
+        //        if (isSmall == false)
+        //        {
+        //            fileName = ReportHelper.GetBoxTemplateNameBig();
+        //        }
+        //        else
+        //        {
+        //            fileName = ReportHelper.GetBoxTemplateNameSmall();
+        //        }
+        //    }
+        //    else if (printType == "扰流板")
+        //    {
+        //        fileName = ReportHelper.GetBoxTemplateNameBig();
+        //    }
+
+        //    report.LoadFromFile(fileName);
+        //    report.Printer.PrinterName = ConfigurationManager.AppSettings[printerName].ToString();
+        //    GetHeadTable = getData;
+
+        //}
         private void button3_Click(object sender, EventArgs e)
         {
             panel1.Visible = false;
diff --git a/PurchingMistakeNew/Form9.cs b/PurchingMistakeNew/Form9.cs
index 3deea6a..58b33b0 100644
--- a/PurchingMistakeNew/Form9.cs
+++ b/PurchingMistakeNew/Form9.cs
@@ -18,6 +18,10 @@ namespace PurchingMistakeNew
 {
     public partial class Form9 : Form
     {
+        private RecordBLL _recordBLL = new RecordBLL();
+        private Func<DataTable> GetHeadTable = null;
+
+        private MESClassLibrary.BLL.Mistake247.RecordBLL _record247BLL = new MESClassLibrary.BLL.Mistake247.RecordBLL();
         public Form9()
         {
             InitializeComponent();
@@ -180,6 +184,8 @@ namespace PurchingMistakeNew
                     {
                         deviceNo = textBox1.Text.Trim();
                         partNo = textBox2.Text.Substring(0, 10);
+                         
+                        string fileName = string.Empty;
 
                         #region 判断半成品和设备码是否匹配
 
@@ -243,30 +249,44 @@ namespace PurchingMistakeNew
                                 {
                                     md.PartType = "X247 前部左侧轮眉";
                                     type = 3;
-                                    report.LoadFromFile(@"D:\X247 前部左侧轮眉.grf");
+                                    
+                                    //report.LoadFromFile(@"D:\X247 前部左侧轮眉.grf");
+
+                                    //report.Printer.PrinterName =
+                                    //    ConfigurationManager.AppSettings["Printer1"].ToString();
+
+                                    //SetPrintInfo(ref fileName, "轮眉", report, "Printer1", _recordBLL.GetLMX247LF);
+                                    UtilityHelper.SetPrintInfo(ref fileName, "轮眉247", report, "Printer1");
+                                    GetHeadTable = _recordBLL.GetLMX247LF;
 
-                                    report.Printer.PrinterName =
-                                        ConfigurationManager.AppSettings["Printer1"].ToString();
                                 }
 
                                 if (partNo == "1230002615")
                                 {
                                     md.PartType = "X247 后部左侧后轮眉";
                                     type = 3;
-                                    report.LoadFromFile(@"D:\X247 后部左侧后轮眉.grf");
+                                    //report.LoadFromFile(@"D:\X247 后部左侧后轮眉.grf");
 
-                                    report.Printer.PrinterName =
-                                        ConfigurationManager.AppSettings["Printer1"].ToString();
+                                    //report.Printer.PrinterName =
+                                    //    ConfigurationManager.AppSettings["Printer1"].ToString();
+
+                                    //SetPrintInfo(ref fileName, "轮眉", report, "Printer1", _recordBLL.GetLMX247HLH);
+                                    UtilityHelper.SetPrintInfo(ref fileName, "轮眉247", report, "Printer1");
+                                    GetHeadTable = _recordBLL.GetLMX247HLH;
                                 }
 
                                 if (partNo == "1230002612")
                                 {
                                     md.PartType = "X247 前部右侧轮眉";
                                     type = 4;
-                                    report.LoadFromFile(@"D:\X247 前部右侧轮眉.grf");
+                                    //report.LoadFromFile(@"D:\X247 前部右侧轮眉.grf");
+
+                                    //report.Printer.PrinterName =
+                                    //    ConfigurationManager.AppSettings["Printer2"].ToString();
 
-                                    report.Printer.PrinterName =
-                                        ConfigurationManager.AppSettings["Printer2"].ToString();
+                                    //SetPrintInfo(ref fileName, "轮眉", report, "Printer2", _recordBLL.GetLMX247FR);
+                                    UtilityHelper.SetPrintInfo(ref fileName, "轮眉247", report, "Printer2");
+                                    GetHeadTable = _recordBLL.GetLMX247FR;
                                 }
 
                                 if (partNo == "1230002617")
@@ -274,10 +294,14 @@ namespace PurchingMistakeNew
                                     md.PartType = "X247 右侧后部后轮眉";
                                     type = 4;
 
-                                    report.LoadFromFile(@"D:\X247 右侧后部后轮眉.grf");
+                                    //report.LoadFromFile(@"D:\X247 右侧后部后轮眉.grf");
+
+                                    //report.Printer.PrinterName =
+                                    //    ConfigurationManager.AppSettings["Printer2"].ToString();
 
-                                    report.Printer.PrinterName =
-                                        ConfigurationManager.AppSettings["Printer2"].ToString();
+                                    //SetPrintInfo(ref fileName, "轮眉", report, "Printer2", _recordBLL.GetLMX247HRH);
+                                    UtilityHelper.SetPrintInfo(ref fileName, "轮眉247", report, "Printer2");
+                                    GetHeadTable = _recordBLL.GetLMX247HRH;
                                 }
 
                                 if (partNo == "1230002619")
@@ -285,10 +309,14 @@ namespace PurchingMistakeNew
                                     md.PartType = "X247 后部左侧前轮眉";
 
                                     type = 5;
-                                    report.LoadFromFile(@"D:\X247 后部左侧轮眉.grf");
+                                    //report.LoadFromFile(@"D:\X247 后部左侧轮眉.grf");
 
-                                    report.Printer.PrinterName =
-                                        ConfigurationManager.AppSettings["Printer1"].ToString();
+                                    //report.Printer.PrinterName =
+                                    //    ConfigurationManager.AppSettings["Printer1"].ToString();
+
+                                    //SetPrintInfo(ref fileName, "轮眉", report, "Printer1", _recordBLL.GetLMX247LH);
+                                    UtilityHelper.SetPrintInfo(ref fileName, "轮眉247", report, "Printer1");
+                                    GetHeadTable = _recordBLL.GetLMX247HLF;
                                 }
 
                                 if (partNo == "1230002621")
@@ -297,10 +325,14 @@ namespace PurchingMistakeNew
 
                                     type = 5;
 
-                                    report.LoadFromFile(@"D:\X247 后部右侧前轮眉.grf");
+                                    //report.LoadFromFile(@"D:\X247 后部右侧前轮眉.grf");
+
+                                    //report.Printer.PrinterName =
+                                    //    ConfigurationManager.AppSettings["Printer1"].ToString();
 
-                                    report.Printer.PrinterName =
-                                        ConfigurationManager.AppSettings["Printer1"].ToString();
+                                    //SetPrintInfo(ref fileName, "轮眉", report, "Printer1", _recordBLL.GetLMX247HRF);
+                                    UtilityHelper.SetPrintInfo(ref fileName, "轮眉247", report, "Printer1");
+                                    GetHeadTable = _recordBLL.GetLMX247HRF;
                                 }
 
                                 #endregion
@@ -320,9 +352,11 @@ namespace PurchingMistakeNew
 
                                 #region 打印总成条码
 
-                                report.Register("");
-                                report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
-                                report.Print(false);
+                                //report.Register("");
+                                //report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
+                                //report.Print(false);
+
+                                UtilityHelper.Print(report, fileName, partNo, GetHeadTable());
                                 abll.UpdateInfo(md);
 
                                 #endregion
@@ -388,7 +422,7 @@ namespace PurchingMistakeNew
                     textBox3.Focus();
                     return;
                 }
-
+                string fileName = string.Empty;
                 DataTable dt = bll.searchPartNo(textBox3.Text.Trim());
                 if (dt != null && dt.Rows.Count > 0)
                 {
@@ -416,52 +450,76 @@ namespace PurchingMistakeNew
                     if (part == "A2478850022")
                     {
                         md.PartType = "X247 前部左侧轮眉";
-                        report.LoadFromFile(@"D:\X247 前部左侧轮眉.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                        //report.LoadFromFile(@"D:\X247 前部左侧轮眉.grf");
+                        //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+
+                        //SetPrintInfo(ref fileName, "轮眉", report, "Printer1", null);
+
+                        UtilityHelper.SetPrintInfo(ref fileName, "轮眉247", report, "Printer1");
                     }
 
                     if (part == "A2478850222")
                     {
                         md.PartType = "X247 后部左侧后轮眉";
-                        report.LoadFromFile(@"D:\X247 后部左侧后轮眉.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                        //report.LoadFromFile(@"D:\X247 后部左侧后轮眉.grf");
+                        //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+
+                        //SetPrintInfo(ref fileName, "轮眉", report, "Printer1", null);
+                        UtilityHelper.SetPrintInfo(ref fileName, "轮眉247", report, "Printer1");
                     }
 
                     if (part == "A2478850122")
                     {
                         md.PartType = "X247 前部右侧轮眉";
-                        report.LoadFromFile(@"D:\X247 前部右侧轮眉.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+
+                        //report.LoadFromFile(@"D:\X247 前部右侧轮眉.grf");
+                        //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+
+                        //SetPrintInfo(ref fileName, "轮眉", report, "Printer2", null);
+                        UtilityHelper.SetPrintInfo(ref fileName, "轮眉247", report, "Printer2");
                     }
 
                     if (part == "A2478850322")
                     {
                         md.PartType = "X247 右侧后部后轮眉";
-                        report.LoadFromFile(@"D:\X247 右侧后部后轮眉.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                        //report.LoadFromFile(@"D:\X247 右侧后部后轮眉.grf");
+                        //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+
+                        //SetPrintInfo(ref fileName, "轮眉", report, "Printer2", null);
+                        UtilityHelper.SetPrintInfo(ref fileName, "轮眉247", report, "Printer2");
                     }
 
                     if (part == "A2477309400")
                     {
                         md.PartType = "X247 后部左侧前轮眉";
-                        report.LoadFromFile(@"D:\X247 后部左侧轮眉.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+
+                        //report.LoadFromFile(@"D:\X247 后部左侧轮眉.grf");
+                        //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+
+                        //SetPrintInfo(ref fileName, "轮眉", report, "Printer1", null);
+                        UtilityHelper.SetPrintInfo(ref fileName, "轮眉247", report, "Printer1");
                     }
 
                     if (part == "A2477309600")
                     {
                         md.PartType = "X247 后部右侧前轮眉";
-                        report.LoadFromFile(@"D:\X247 后部右侧前轮眉.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+
+                        //report.LoadFromFile(@"D:\X247 后部右侧前轮眉.grf");
+                        //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+
+                        //SetPrintInfo(ref fileName, "轮眉", report, "Printer2", null);
+                        UtilityHelper.SetPrintInfo(ref fileName, "轮眉247", report, "Printer2");
                     }
 
                     #endregion
 
                     #endregion
 
-                    report.Register("");
-                    report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
-                    report.Print(false);
+                    //report.Register("");
+                    //report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
+                    //report.Print(false);
+
+                    UtilityHelper.Print(report, fileName, part, dt);
                     bll.UpdateInfo(md);
                 }
                 else
@@ -556,5 +614,53 @@ namespace PurchingMistakeNew
 
             return false;
         }
+
+        //void SetPrintInfo(ref string fileName, string printType, GridppReport report, string printerName, Func<DataTable> getData)
+        //{
+        //    if (printType == "门板")
+        //    {
+        //        fileName = ReportHelper.GetTemplateDoor();
+        //    }
+        //    else if (printType == "轮眉")
+        //    {
+        //        fileName = ReportHelper.GetTemplateWheelBrow247();
+        //    }
+        //    else if (printType == "扰流板")
+        //    {
+        //        fileName = ReportHelper.GetTemplateSpoiler();
+        //    }
+        //    else if (printType == "轮眉X243")
+        //    {
+        //        fileName = ReportHelper.GetTemplateWheelBrow243();
+        //    }
+        //    report.LoadFromFile(fileName);
+        //    report.Printer.PrinterName = ConfigurationManager.AppSettings[printerName].ToString();
+        //    GetHeadTable = getData;
+        //}
+        //void Print(GridppReport report, string fileName, string part, DataTable assembleTable)
+        //{
+        //    DataTable headTable = null;
+        //    if (string.IsNullOrEmpty(fileName))
+        //    {
+        //        report.Register("");
+        //        report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
+        //        report.Print(false);
+        //    }
+        //    else
+        //    {
+        //        headTable = assembleTable;
+        //        headTable.Columns.Add("QLevel");
+        //        foreach (DataRow dr in headTable.Rows)
+        //        {
+        //            string qlevel = _record247BLL.SearchQLevelFromWms("", part);
+        //            dr["QLevel"] = qlevel;
+        //        }
+
+        //        ReportHelper report2 = new ReportHelper(fileName, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, report.Printer.PrinterName);
+        //        report2.Report.Printer.PrinterName = report.Printer.PrinterName;
+        //        report2.Report.Print(false);
+        //    }
+
+        //}
     }
 }
diff --git a/PurchingMistakeNew/FrmCheck243.cs b/PurchingMistakeNew/FrmCheck243.cs
index 8720512..193f9e9 100644
--- a/PurchingMistakeNew/FrmCheck243.cs
+++ b/PurchingMistakeNew/FrmCheck243.cs
@@ -18,6 +18,10 @@ namespace PurchingMistakeNew
 {
     public partial class FrmCheck243 : Form
     {
+        private Func<DataTable> GetHeadTable = null;
+        private MESClassLibrary.BLL.Mistake247.BoxBLL _boxBll = new MESClassLibrary.BLL.Mistake247.BoxBLL();
+        private MESClassLibrary.BLL.Mistake247.RecordBLL _recordBLL = new MESClassLibrary.BLL.Mistake247.RecordBLL();
+       
         public FrmCheck243()
         {
             InitializeComponent();
@@ -119,7 +123,8 @@ namespace PurchingMistakeNew
                     {
                         box = "";
                     }
-
+                    DataTable headTable = null;
+                    string fileName = string.Empty;
                     batch = DateTime.Now.ToString("yyyy-MM-dd").Substring(2, 2) + DateTime.Now.ToString("yyyy-MM-dd").Substring(5, 2) + DateTime.Now.ToString("yyyy-MM-dd").Substring(8, 2);
                     if (box != "")
                     {
@@ -166,37 +171,44 @@ namespace PurchingMistakeNew
                             bll.AddInfo(md);
 
                             #region 打印装箱单
-
-                            if (part == "A2438808501")
-                            {
-                                report.LoadFromFile(@"D:\X243 前部左侧轮眉装箱单.grf");
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                            }
-
-                            if (part == "A2478850222")
-                            {
-                                report.LoadFromFile(@"D:\X243 后部左侧轮眉装箱单.grf");
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                            }
-
-                            if (part == "A2438808601")
-                            {
-                                report.LoadFromFile(@"D:\X243 前部右侧轮眉装箱单.grf");
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                            }
-
-                            if (part == "A2478850322")
-                            {
-                                report.LoadFromFile(@"D:\X243 后部右侧后轮眉装箱单.grf");
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                            }
+                            string moudleType = string.Empty;//例如 后左
+                            string partType = string.Empty;//例如 门板,轮眉
+                            string carType = string.Empty; //车型 X247  H247等
+                            SetPrintInfo(part, report, ref fileName, ref moudleType, ref partType, ref carType);
+
+
+                            //if (part == "A2438808501")
+                            //{
+                            //    report.LoadFromFile(@"D:\X243 前部左侧轮眉装箱单.grf");
+                            //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                            //}
+
+                            //if (part == "A2478850222")
+                            //{
+                            //    report.LoadFromFile(@"D:\X243 后部左侧轮眉装箱单.grf");
+                            //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                            //}
+
+                            //if (part == "A2438808601")
+                            //{
+                            //    report.LoadFromFile(@"D:\X243 前部右侧轮眉装箱单.grf");
+                            //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                            //}
+
+                            //if (part == "A2478850322")
+                            //{
+                            //    report.LoadFromFile(@"D:\X243 后部右侧后轮眉装箱单.grf");
+                            //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                            //}
 
                             #endregion
 
-                            report.Register("");
-                            report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
-                            report.Print(false);
+                            //report.Register("");
+                            //report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
+                            //report.Print(false);
 
+                            //Print(report, fileName, part);
+                            UtilityHelper.PrintBox(report, fileName, part, moudleType, partType, carType, GetHeadTable);
                             bll.UpdateInfo(md);
 
                             #endregion
@@ -230,38 +242,42 @@ namespace PurchingMistakeNew
                             bll.AddInfo(md);
 
                             #region 打印装箱单
-
-
-                            if (part == "A2438808501")
-                            {
-                                report.LoadFromFile(@"D:\X243 前部左侧轮眉装箱单.grf");
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                            }
-
-                            if (part == "A2478850222")
-                            {
-                                report.LoadFromFile(@"D:\X243 后部左侧轮眉装箱单.grf");
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                            }
-
-                            if (part == "A2438808601")
-                            {
-                                report.LoadFromFile(@"D:\X243 前部右侧轮眉装箱单.grf");
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                            }
-
-                            if (part == "A2478850322")
-                            {
-                                report.LoadFromFile(@"D:\X243 后部右侧后轮眉装箱单.grf");
-                                report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                            }
+                            string moudleType = string.Empty;//例如 后左
+                            string partType = string.Empty;//例如 门板,轮眉
+                            string carType = string.Empty; //车型 X247  H247等
+                            SetPrintInfo(part, report, ref fileName, ref moudleType, ref partType, ref carType);
+                            //if (part == "A2438808501")
+                            //{
+                            //    report.LoadFromFile(@"D:\X243 前部左侧轮眉装箱单.grf");
+                            //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                            //}
+
+                            //if (part == "A2478850222")
+                            //{
+                            //    report.LoadFromFile(@"D:\X243 后部左侧轮眉装箱单.grf");
+                            //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                            //}
+
+                            //if (part == "A2438808601")
+                            //{
+                            //    report.LoadFromFile(@"D:\X243 前部右侧轮眉装箱单.grf");
+                            //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                            //}
+
+                            //if (part == "A2478850322")
+                            //{
+                            //    report.LoadFromFile(@"D:\X243 后部右侧后轮眉装箱单.grf");
+                            //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                            //}
 
                             #endregion
 
-                            report.Register("");
-                            report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
-                            report.Print(false);
+                            //report.Register("");
+                            //report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
+                            //report.Print(false);
 
+                            //Print(report, fileName, part);
+                            UtilityHelper.PrintBox(report, fileName, part, moudleType, partType, carType, GetHeadTable);
                             bll.UpdateInfo(md);
 
                             #endregion
@@ -279,7 +295,93 @@ namespace PurchingMistakeNew
                 LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
             }
         }
+        /// <summary>
+        /// 设置打印信息
+        /// </summary>
+        /// <param name="part"></param>
+        /// <param name="report"></param>
+        /// <param name="fileName"></param>
+        void SetPrintInfo(string part, GridppReport report, ref string fileName, ref string moudleType, ref string partType, ref string carType)
+        {
+            if (part == "A2438808501")
+            {
+                //report.LoadFromFile(@"D:\X243 前部左侧轮眉装箱单.grf");
+                //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                moudleType = "前左";
+                partType = "轮眉";
+                carType = "X243";
+                UtilityHelper.SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer1", false);
+                GetHeadTable = _boxBll.GetX243LF_LM;
+               // SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer1", _boxBll.GetX243LF_LM);
+            }
 
+            if (part == "A2478850222")
+            {
+                //report.LoadFromFile(@"D:\X243 后部左侧轮眉装箱单.grf");
+                //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                moudleType = "后左";
+                partType = "轮眉";
+                carType = "X243";
+                UtilityHelper.SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer1", false);
+                GetHeadTable = _boxBll.GetX243LR_LM;
+                //SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer1", _boxBll.GetX243LR_LM);
+            }
+
+            if (part == "A2438808601")
+            {
+                //report.LoadFromFile(@"D:\X243 前部右侧轮眉装箱单.grf");
+                //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                moudleType = "前右";
+                partType = "轮眉";
+                carType = "X243";
+                UtilityHelper.SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer2", false);
+                GetHeadTable = _boxBll.GetX243RF_LM;
+                //SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer2", _boxBll.GetX243RF_LM);
+            }
+
+            if (part == "A2478850322")
+            {
+                //report.LoadFromFile(@"D:\X243 后部右侧后轮眉装箱单.grf");
+                //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                moudleType = "后右后";
+                partType = "轮眉";
+                carType = "X243";
+                UtilityHelper.SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer2", false);
+                GetHeadTable = _boxBll.GetX243HRH_LM;
+                //SetBoxPrintInfo(ref fileName, "轮眉", report, "Printer2", _boxBll.GetX243HRH_LM);
+            }
+
+        }
+        //void SetBoxPrintInfo(ref string fileName, string printType, GridppReport report, string printerName, Func<DataTable> getData, bool isSmall = true)
+        //{
+        //    if (printType == "门板")
+        //    {
+        //        fileName = ReportHelper.GetBoxTemplateNameBig();
+        //    }
+        //    else if (printType == "轮眉")
+        //    {
+        //        if (isSmall == false)
+        //        {
+        //            fileName = ReportHelper.GetBoxTemplateNameBig();
+        //        }
+        //        else
+        //        {
+        //            fileName = ReportHelper.GetBoxTemplateNameSmall();
+        //        }
+        //    }
+        //    else if (printType == "扰流板")
+        //    {
+        //        fileName = ReportHelper.GetBoxTemplateNameBig();
+        //    }
+
+        //    report.LoadFromFile(fileName);
+        //    report.Printer.PrinterName = ConfigurationManager.AppSettings[printerName].ToString();
+        //    GetHeadTable = getData;
+
+        //}
+       
+        
+        
         private void textBox1_KeyDown(object sender, KeyEventArgs e)
         {
             Mistake243BLL mbll = new Mistake243BLL();
@@ -576,7 +678,8 @@ namespace PurchingMistakeNew
                     textBox3.Focus();
                     return;
                 }
-
+                DataTable headTable = null;
+                string fileName = string.Empty;
                 DataTable dt = bll.SearchBoxIsExsit(textBox3.Text.Trim());
                 if (dt != null && dt.Rows.Count > 0)
                 {
@@ -597,37 +700,43 @@ namespace PurchingMistakeNew
                     #endregion
 
                     #region 打印装箱单
-
-                    if (part == "A2438808501")
-                    {
-                        report.LoadFromFile(@"D:\X243 前部左侧轮眉装箱单.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                    }
-
-                    if (part == "A2478850222")
-                    {
-                        report.LoadFromFile(@"D:\X243 后部左侧轮眉装箱单.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
-                    }
-
-                    if (part == "A2438808601")
-                    {
-                        report.LoadFromFile(@"D:\X243 前部右侧轮眉装箱单.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                    }
-
-                    if (part == "A2478850322")
-                    {
-                        report.LoadFromFile(@"D:\X243 后部右侧后轮眉装箱单.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
-                    }
+                    string moudleType = string.Empty;//例如 后左
+                    string partType = string.Empty;//例如 门板,轮眉
+                    string carType = string.Empty; //车型 X247  H247等
+                    SetPrintInfo(part, report, ref fileName, ref moudleType, ref partType, ref carType);
+
+                    //if (part == "A2438808501")
+                    //{
+                    //    report.LoadFromFile(@"D:\X243 前部左侧轮眉装箱单.grf");
+                    //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                    //}
+
+                    //if (part == "A2478850222")
+                    //{
+                    //    report.LoadFromFile(@"D:\X243 后部左侧轮眉装箱单.grf");
+                    //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                    //}
+
+                    //if (part == "A2438808601")
+                    //{
+                    //    report.LoadFromFile(@"D:\X243 前部右侧轮眉装箱单.grf");
+                    //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                    //}
+
+                    //if (part == "A2478850322")
+                    //{
+                    //    report.LoadFromFile(@"D:\X243 后部右侧后轮眉装箱单.grf");
+                    //    report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                    //}
 
                     #endregion
 
-                    report.Register("");
-                    report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
-                    report.Print(false);
+                    //report.Register("");
+                    //report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
+                    //report.Print(false);
 
+                   // Print(report, fileName, part);
+                    UtilityHelper.PrintBox(report, fileName, part, moudleType, partType, carType, GetHeadTable);
                     bll.UpdateInfo(md);
                 }
 
@@ -643,7 +752,30 @@ namespace PurchingMistakeNew
                 LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
             }
         }
-
+        //void Print(GridppReport report , string fileName,string part)
+        //{
+        //    DataTable headTable = null;
+        //    if (string.IsNullOrEmpty(fileName))
+        //    {
+        //        report.Register("");
+        //        report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
+        //        report.Print(false);
+        //    }
+        //    else
+        //    {
+        //        headTable = GetHeadTable();
+        //        headTable.Columns.Add("QLevel");
+        //        foreach (DataRow dr in headTable.Rows)
+        //        {
+        //            string qlevel = _recordBLL.SearchQLevelFromWms("", part);
+        //            dr["QLevel"] = qlevel;
+        //        }
+
+        //        ReportHelper report2 = new ReportHelper(fileName, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, report.Printer.PrinterName);
+        //        report2.Report.Printer.PrinterName = report.Printer.PrinterName;
+        //        report2.Report.Print(false);
+        //    }
+        //}
         private void button3_Click(object sender, EventArgs e)
         {
             panel1.Visible = false;
diff --git a/PurchingMistakeNew/FrmProduct_243.cs b/PurchingMistakeNew/FrmProduct_243.cs
index 68d3d0d..63c65e5 100644
--- a/PurchingMistakeNew/FrmProduct_243.cs
+++ b/PurchingMistakeNew/FrmProduct_243.cs
@@ -20,6 +20,11 @@ namespace PurchingMistakeNew
 {
     public partial class FrmProduct_243 : Form
     {
+        private RecordBLL _recordBLL = new RecordBLL();
+        private Func<DataTable> GetHeadTable = null;
+
+        private MESClassLibrary.BLL.Mistake247.RecordBLL _record247BLL = new MESClassLibrary.BLL.Mistake247.RecordBLL();
+
         public FrmProduct_243()
         {
             InitializeComponent();
@@ -198,7 +203,8 @@ namespace PurchingMistakeNew
                     {
                         deviceNo = textBox1.Text.Trim();
                         partNo = textBox2.Text.Substring(0, 10);
-
+                        DataTable headTable = null;
+                        string fileName = string.Empty;
                         #region 判断半成品和设备码是否匹配
 
                         DataTable dt = bll.IsMath(deviceNo, partNo);
@@ -253,30 +259,43 @@ namespace PurchingMistakeNew
                                 {
                                     md.PartType = "X243 前部左侧轮眉";
                                     type = 3;
-                                    report.LoadFromFile(@"D:\X243 前部左侧轮眉.grf");
+                                    //report.LoadFromFile(@"D:\X243 前部左侧轮眉.grf");
+
+                                    //report.Printer.PrinterName =
+                                    //    ConfigurationManager.AppSettings["Printer1"].ToString();
+
+                                    //SetPrintInfo(ref fileName, "轮眉X243", report, "Printer1", _recordBLL.GetX243FL_LM);
 
-                                    report.Printer.PrinterName =
-                                        ConfigurationManager.AppSettings["Printer1"].ToString();
+                                    UtilityHelper.SetPrintInfo(ref fileName, "轮眉243", report, "Printer1");
+                                    GetHeadTable = _recordBLL.GetX243FL_LM;
                                 }
 
                                 if (partNo == "1230002615")
                                 {
                                     md.PartType = "X243 后部左侧轮眉";
                                     type = 3;
-                                    report.LoadFromFile(@"D:\X243 后部左侧轮眉.grf");
+                                    //report.LoadFromFile(@"D:\X243 后部左侧轮眉.grf");
 
-                                    report.Printer.PrinterName =
-                                        ConfigurationManager.AppSettings["Printer1"].ToString();
+                                    //report.Printer.PrinterName =
+                                    //    ConfigurationManager.AppSettings["Printer1"].ToString();
+
+                                    //SetPrintInfo(ref fileName, "轮眉X243", report, "Printer1", _recordBLL.GetX243HL_LM);
+                                    UtilityHelper.SetPrintInfo(ref fileName, "轮眉243", report, "Printer1");
+                                    GetHeadTable = _recordBLL.GetX243HL_LM;
                                 }
 
                                 if (partNo == "1230005989")
                                 {
                                     md.PartType = "X243 前部右侧轮眉";
                                     type = 4;
-                                    report.LoadFromFile(@"D:\X243 前部右侧轮眉.grf");
+                                    //report.LoadFromFile(@"D:\X243 前部右侧轮眉.grf");
+
+                                    //report.Printer.PrinterName =
+                                    //    ConfigurationManager.AppSettings["Printer2"].ToString();
 
-                                    report.Printer.PrinterName =
-                                        ConfigurationManager.AppSettings["Printer2"].ToString();
+                                    //SetPrintInfo(ref fileName, "轮眉X243", report, "Printer2", _recordBLL.GetX243FR_LM);
+                                    UtilityHelper.SetPrintInfo(ref fileName, "轮眉243", report, "Printer2");
+                                    GetHeadTable = _recordBLL.GetX243FR_LM;
                                 }
 
                                 if (partNo == "1230002617")
@@ -284,10 +303,13 @@ namespace PurchingMistakeNew
                                     md.PartType = "X243 右侧后部后轮眉";
                                     type = 4;
 
-                                    report.LoadFromFile(@"D:\X243 右侧后部后轮眉.grf");
+                                    //report.LoadFromFile(@"D:\X243 右侧后部后轮眉.grf");
+                                    //report.Printer.PrinterName =
+                                    //    ConfigurationManager.AppSettings["Printer2"].ToString();
 
-                                    report.Printer.PrinterName =
-                                        ConfigurationManager.AppSettings["Printer2"].ToString();
+                                    //SetPrintInfo(ref fileName, "轮眉X243", report, "Printer2", _recordBLL.GetX243HRH_LM);
+                                    UtilityHelper.SetPrintInfo(ref fileName, "轮眉243", report, "Printer2");
+                                    GetHeadTable = _recordBLL.GetX243HRH_LM;
                                 }
 
                                 #endregion
@@ -306,9 +328,13 @@ namespace PurchingMistakeNew
 
                                 #region 打印总成条码
 
-                                report.Register("");
-                                report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
-                                report.Print(false);
+                                //report.Register("");
+                                //report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
+                                //report.Print(false);
+
+                                //Print(report, fileName, partNo,GetHeadTable());
+                                UtilityHelper.Print(report, fileName, partNo, GetHeadTable());
+
                                 abll.UpdateInfo(md);
 
                                 #endregion
@@ -353,7 +379,53 @@ namespace PurchingMistakeNew
                 LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
             }
         }
-
+        //void SetPrintInfo(ref string fileName, string printType, GridppReport report, string printerName, Func<DataTable> getData)
+        //{
+        //    if (printType == "门板")
+        //    {
+        //        fileName = ReportHelper.GetTemplateDoor();
+        //    }
+        //    else if (printType == "轮眉")
+        //    {
+        //        fileName = ReportHelper.GetTemplateWheelBrow247();
+        //    }
+        //    else if (printType == "扰流板")
+        //    {
+        //        fileName = ReportHelper.GetTemplateSpoiler();
+        //    }
+        //    else if (printType == "轮眉X243")
+        //    {
+        //        fileName = ReportHelper.GetTemplateWheelBrow243();
+        //    }
+        //    report.LoadFromFile(fileName);
+        //    report.Printer.PrinterName = ConfigurationManager.AppSettings[printerName].ToString();
+        //    GetHeadTable = getData;
+        //}
+        //void Print(GridppReport report, string fileName, string part,DataTable assembleTable)
+        //{
+        //    DataTable headTable = null;
+        //    if (string.IsNullOrEmpty(fileName))
+        //    {
+        //        report.Register("");
+        //        report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
+        //        report.Print(false);
+        //    }
+        //    else
+        //    {
+        //        headTable = assembleTable;
+        //        headTable.Columns.Add("QLevel");
+        //        foreach (DataRow dr in headTable.Rows)
+        //        {
+        //            string qlevel = _record247BLL.SearchQLevelFromWms("", part);
+        //            dr["QLevel"] = qlevel;
+        //        }
+
+        //        ReportHelper report2 = new ReportHelper(fileName, headTable, null, (int)GRPaperOrientation.grpoDefault, 1, report.Printer.PrinterName);
+        //        report2.Report.Printer.PrinterName = report.Printer.PrinterName;
+        //        report2.Report.Print(false);
+        //    }
+
+        //}
         public void initData()
         {
             string[] part =
@@ -443,42 +515,59 @@ namespace PurchingMistakeNew
                     part = textBox3.Text.Trim().Substring(0, textBox3.Text.Trim().IndexOf("."));
 
                     #region 轮眉
-
+                    string fileName = string.Empty;
                     if (part == "A2438808501")
                     {
                         md.PartType = "X243 前部左侧轮眉";
-                        report.LoadFromFile(@"D:\X247 前部左侧轮眉.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                        //report.LoadFromFile(@"D:\X247 前部左侧轮眉.grf");
+                        //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+
+                       // SetPrintInfo(ref fileName, "轮眉X243", report, "Printer1", null);
+
+                        UtilityHelper.SetPrintInfo(ref fileName, "轮眉243", report, "Printer1");
+                   
                     }
 
                     if (part == "A2478850222")
                     {
                         md.PartType = "X243 后部左侧后轮眉";
-                        report.LoadFromFile(@"D:\X243 后部左侧后轮眉.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+                        //report.LoadFromFile(@"D:\X243 后部左侧后轮眉.grf");
+                        //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer1"].ToString();
+
+                        //SetPrintInfo(ref fileName, "轮眉X243", report, "Printer1", null);
+                        UtilityHelper.SetPrintInfo(ref fileName, "轮眉243", report, "Printer1");
                     }
 
                     if (part == "A2438808601")
                     {
                         md.PartType = "X243 前部右侧轮眉";
-                        report.LoadFromFile(@"D:\X243 前部右侧轮眉.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                        //report.LoadFromFile(@"D:\X243 前部右侧轮眉.grf");
+                        //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+
+                        //SetPrintInfo(ref fileName, "轮眉X243", report, "Printer2", null);
+                        UtilityHelper.SetPrintInfo(ref fileName, "轮眉243", report, "Printer2");
                     }
 
                     if (part == "A2478850322")
                     {
                         md.PartType = "X243 右侧后部后轮眉";
-                        report.LoadFromFile(@"D:\X243 右侧后部后轮眉.grf");
-                        report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+                        //report.LoadFromFile(@"D:\X243 右侧后部后轮眉.grf");
+                        //report.Printer.PrinterName = ConfigurationManager.AppSettings["Printer2"].ToString();
+
+                        //SetPrintInfo(ref fileName, "轮眉X243", report, "Printer2", null);
+                        UtilityHelper.SetPrintInfo(ref fileName, "轮眉243", report, "Printer2");
                     }
 
                     #endregion
 
                     #endregion
 
-                    report.Register("");
-                    report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
-                    report.Print(false);
+                    //report.Register("");
+                    //report.ConnectionString = ConfigurationManager.ConnectionStrings["report"].ToString();
+                    //report.Print(false);
+
+                    //Print(report, fileName, part, dt);
+                    UtilityHelper.Print(report, fileName, part, dt);
                     bll.UpdateInfo(md);
                 }
                 else
diff --git a/PurchingMistakeNew/Program.cs b/PurchingMistakeNew/Program.cs
index fd41b9a..082cd92 100644
--- a/PurchingMistakeNew/Program.cs
+++ b/PurchingMistakeNew/Program.cs
@@ -26,46 +26,46 @@ namespace PurchingMistakeNew
                 switch (load)
                 {
                     case "1":    //门板生产
-                        Application.Run(new Form1());
+                        Application.Run(new Form1());//OK
                         break;
                     case "2":    //门板入库
-                        Application.Run(new Form3());
+                        Application.Run(new Form3());//OK
                         break;
                     case "3":    //x247轮眉生产
-                        Application.Run(new Form4());
+                        Application.Run(new Form4());//OK
                         break;
                     case "4":    //x247轮眉入库
-                        Application.Run(new Form5());
+                        Application.Run(new Form5());//OK
                         break;
                     case "5":    //x247小轮眉生产
-                        Application.Run(new Form6());
+                        Application.Run(new Form6()); //OK
                         break;
                     case "6":    //扰流板生产
-                        Application.Run(new Form7());
+                        Application.Run(new Form7());//没改,有点特殊
                         break;
                     case "7":    //扰流板入库
-                        Application.Run(new Form8());
+                        Application.Run(new Form8()); //OK
                         break;
                     case "8":    //x243轮眉生产
-                        Application.Run(new Form9());
+                        Application.Run(new Form9());//可能用FrmProduct_243了
                         break;
                     case "9":    //x247轮眉入库
-                        Application.Run(new Form10());
+                        Application.Run(new Form10());//页面为空 可能用FrmCheck243了
                         break;
                     case "10":    //x243轮眉生产
-                        Application.Run(new FrmProduct_243());
+                        Application.Run(new FrmProduct_243()); //OK  243条码啥样不知道
                         break;
                     case "11":    //x243轮眉入库
-                        Application.Run(new FrmCheck243());
+                        Application.Run(new FrmCheck243()); //OK  243箱码啥样不知道
                         break;
                     case "12":    //x247订单打印
-                        Application.Run(new FrmPrint());
+                        Application.Run(new FrmPrint()); //不用
                         break;
                     case "13":    //x243订单打印
-                        Application.Run(new FrmPrint_243());
+                        Application.Run(new FrmPrint_243());//不用
                         break;
                     case "14":    //x247轮眉扫描给视觉
-                        Application.Run(new FrmScan_247());
+                        Application.Run(new FrmScan_247());//不用
                         break;
                     default:
                         break;
diff --git a/PurchingMistakeNew/PurchingMistakeNew.csproj b/PurchingMistakeNew/PurchingMistakeNew.csproj
index ce36dd5..37d5c3a 100644
--- a/PurchingMistakeNew/PurchingMistakeNew.csproj
+++ b/PurchingMistakeNew/PurchingMistakeNew.csproj
@@ -61,9 +61,6 @@
       <HintPath>..\dlls\Interop.gregn6Lib.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-    <Reference Include="MESClassLibrary">
-      <HintPath>..\MESClassLibrary\bin\Debug\MESClassLibrary.dll</HintPath>
-    </Reference>
     <Reference Include="SchTaskExtAPI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>bin\Debug\SchTaskExtAPI.dll</HintPath>
@@ -189,6 +186,7 @@
     <Compile Include="UserControl1.Designer.cs">
       <DependentUpon>UserControl1.cs</DependentUpon>
     </Compile>
+    <Compile Include="UtilityHelper.cs" />
     <Compile Include="VerifyHelper.cs" />
     <EmbeddedResource Include="Form1.resx">
       <DependentUpon>Form1.cs</DependentUpon>
@@ -263,31 +261,28 @@
     <None Include="Report\11.grf">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Report\22.grf">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="Report\X247右侧前门板装箱单.grf">
+    <None Include="Report\标签-243轮眉.grf">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Report\X247右侧后门板装箱单.grf">
+    <None Include="Report\标签-247扰流板.grf">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Report\X247后部中间扰流板.grf">
+    <None Include="Report\标签-247轮眉.grf">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Report\X247后部扰流板装箱单.grf">
+    <None Include="Report\标签-247门板.grf">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Report\X247左侧前门板装箱单.grf">
+    <None Include="Report\装箱单-243轮眉.grf">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Report\X247左侧后门板装箱单.grf">
+    <None Include="Report\装箱单-247扰流板.grf">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Report\X247装箱单.grf">
+    <None Include="Report\装箱单-247轮眉.grf">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Report\X247门板.grf">
+    <None Include="Report\装箱单-247门板.grf">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
@@ -310,7 +305,12 @@
   <ItemGroup>
     <Content Include="Stone.Common.dll" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <ProjectReference Include="..\MESClassLibrary\MESClassLibrary.csproj">
+      <Project>{867989d8-6837-41dc-9bf1-4658f5d6cfef}</Project>
+      <Name>MESClassLibrary</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/PurchingMistakeNew/Report/22.grf b/PurchingMistakeNew/Report/22.grf
deleted file mode 100644
index 608ac2a..0000000
Binary files a/PurchingMistakeNew/Report/22.grf and /dev/null differ
diff --git a/PurchingMistakeNew/Report/X247 右侧前门板.grf b/PurchingMistakeNew/Report/X247 右侧前门板.grf
deleted file mode 100644
index 5f9bd23..0000000
--- a/PurchingMistakeNew/Report/X247 右侧前门板.grf	
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-	"Version":"6.6.2.0",
-	"Font":{
-		"Name":"宋体",
-		"Size":105000,
-		"Weight":400,
-		"Charset":134
-	},
-	"Printer":{
-		"Size":256,
-		"Width":6,
-		"Height":7,
-		"LeftMargin":0,
-		"TopMargin":0,
-		"RightMargin":0,
-		"BottomMargin":0
-	},
-	"DetailGrid":{
-		"Recordset":{
-			"ConnectionString":"Provider=SQLOLEDB.1;Password=a1+;Persist Security Info=True;User ID=sa;Initial Catalog=BBMPT;Data Source=10.60.101.9;Use Procedure for Prepare=1;Auto Translate=True;Packet Size=4096;Workstation ID=AMW-PC;Use Encryption for Data=False;Tag with column collation when possible=False",
-			"QuerySQL":"SELECT * FROM [dbo].[tb_Assembly_247] WHERE SUBSTRING(PartNo,1,11) in ('A2477203107','A2477203307','A2477205106' )AND PrintTime IS NULL ORDER BY CreateTime",
-			"Field":[
-				{
-					"Name":"ID"
-				},
-				{
-					"Name":"PartNo"
-				},
-				{
-					"Name":"PartName"
-				},
-				{
-					"Name":"BatchNo"
-				},
-				{
-					"Name":"Color"
-				},
-				{
-					"Name":"ColorNo"
-				},
-				{
-					"Name":"PartType"
-				},
-				{
-					"Name":"Validity"
-				},
-				{
-					"Name":"ValidityDate"
-				},
-				{
-					"Name":"CreateTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"PrintTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"TapeBatchNo"
-				},
-				{
-					"Name":"Des"
-				}
-			]
-		},
-		"ColumnContent":{
-			"Height":0
-		},
-		"ColumnTitle":{
-			"Height":0
-		}
-	},
-	"PageFooter":{
-		"Height":0
-	},
-	"ReportHeader":[
-		{
-			"Name":"ReportHeader1",
-			"Height":6.00604,
-			"Control":[
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox1",
-					"Top":0.343958,
-					"Width":1.79917,
-					"Height":0.582083,
-					"Text":"规格型号："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox1",
-					"Top":0.926042,
-					"Width":6.00604,
-					"Height":0.396875,
-					"Font":{
-						"Name":"宋体",
-						"Size":120000,
-						"Weight":400,
-						"Charset":134
-					},
-					"DataField":"PartNo"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox2",
-					"Left":0.211667,
-					"Top":3.96875,
-					"Width":0.978958,
-					"Height":0.608542,
-					"Text":"批次："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox2",
-					"Left":1.21708,
-					"Top":3.96875,
-					"Width":1.79917,
-					"Height":0.396875,
-					"DataField":"BatchNo"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox3",
-					"Top":1.32292,
-					"Width":5.60917,
-					"Height":0.608542,
-					"DataField":"PartName"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox3",
-					"Top":2.30188,
-					"Width":1.19063,
-					"Height":0.608542,
-					"Text":"车型："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox4",
-					"Left":1.24354,
-					"Top":2.30188,
-					"Width":4.20688,
-					"Height":0.608542,
-					"DataField":"PartType"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox4",
-					"Left":0.396875,
-					"Top":2.77813,
-					"Width":2.01083,
-					"Height":0.79375,
-					"Text":"胶带有效期："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox5",
-					"Left":2.80458,
-					"Top":2.98979,
-					"Width":2.98979,
-					"Height":0.423333,
-					"DataField":"Validity"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox6",
-					"Left":-0.15875,
-					"Top":3.57188,
-					"Width":5.90021,
-					"Height":0.396875,
-					"DataField":"ValidityDate"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox5",
-					"Left":0.211667,
-					"Top":5.15938,
-					"Width":0.978958,
-					"Height":0.608542,
-					"Text":"颜色："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox7",
-					"Left":1.19063,
-					"Top":5.15938,
-					"Width":1.61396,
-					"Height":0.608542,
-					"DataField":"Color"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox8",
-					"Left":-0.15875,
-					"Top":4.57729,
-					"Width":2.24896,
-					"Height":0.582083,
-					"DataField":"ColorNo"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox9",
-					"Left":-0.132292,
-					"Top":1.71979,
-					"Width":5.18583,
-					"Height":0.582083,
-					"DataField":"Des"
-				},
-				{
-					"Type":"Barcode",
-					"Name":"Barcode1",
-					"Left":2.8575,
-					"Top":3.96875,
-					"Width":2.38125,
-					"Height":2.01083,
-					"BarcodeType":"QRCode",
-					"CaptionPosition":"None",
-					"Text":"[#PartNo#]"
-				}
-			]
-		}
-	]
-}
\ No newline at end of file
diff --git a/PurchingMistakeNew/Report/X247 右侧前门板装箱单.grf b/PurchingMistakeNew/Report/X247 右侧前门板装箱单.grf
deleted file mode 100644
index 64461cd..0000000
--- a/PurchingMistakeNew/Report/X247 右侧前门板装箱单.grf	
+++ /dev/null
@@ -1,221 +0,0 @@
-{
-	"Version":"6.6.2.0",
-	"Font":{
-		"Name":"宋体",
-		"Size":105000,
-		"Weight":400,
-		"Charset":134
-	},
-	"Printer":{
-		"Size":256,
-		"Width":7,
-		"Height":6,
-		"LeftMargin":0,
-		"TopMargin":0,
-		"RightMargin":0,
-		"BottomMargin":0
-	},
-	"DetailGrid":{
-		"Recordset":{
-			"ConnectionString":"Provider=SQLOLEDB.1;Password=a1+;Persist Security Info=True;User ID=sa;Initial Catalog=BBMPT;Data Source=10.60.101.9;Use Procedure for Prepare=1;Auto Translate=True;Packet Size=4096;Workstation ID=AMW-PC;Use Encryption for Data=False;Tag with column collation when possible=False",
-			"QuerySQL":"SELECT * FROM [dbo].[tb_Box_247] WHERE PartNo in('A2477204706','A2477204906','A2477205106') AND [PrintTime] IS NULL  ORDER BY [CreateTime]",
-			"Field":[
-				{
-					"Name":"ID"
-				},
-				{
-					"Name":"BoxNo"
-				},
-				{
-					"Name":"PartNo"
-				},
-				{
-					"Name":"PartName"
-				},
-				{
-					"Name":"BatchNo"
-				},
-				{
-					"Name":"BoxCount",
-					"Type":"Float"
-				},
-				{
-					"Name":"CreateTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"PrintTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"Des"
-				}
-			]
-		},
-		"ColumnContent":{
-			"Height":0
-		},
-		"ColumnTitle":{
-			"Height":0
-		}
-	},
-	"PageFooter":{
-		"Height":0
-	},
-	"ReportHeader":[
-		{
-			"Name":"ReportHeader1",
-			"Height":5.21229,
-			"Control":[
-				{
-					"Type":"FreeGrid",
-					"Name":"FreeGrid1",
-					"Left":0.291042,
-					"Top":0.238125,
-					"Border":{
-						"Styles":"[DrawLeft|DrawTop|DrawRight|DrawBottom]"
-					},
-					"ColumnCount":4,
-					"RowCount":6,
-					"FreeGridColumn":[
-						{
-							"index":1,
-							"Width":1.71979
-						},
-						{
-							"index":2,
-							"Width":2.30188
-						},
-						{
-							"index":3,
-							"Width":2.2
-						},
-						{
-							"index":4,
-							"Width":0
-						}
-					],
-					"FreeGridRow":[
-						{
-							"index":1,
-							"Height":0.79375
-						},
-						{
-							"index":4,
-							"Height":1.05833
-						},
-						{
-							"index":5,
-							"Height":0.978958
-						},
-						{
-							"index":6,
-							"Height":0.767292
-						}
-					],
-					"FreeGridCell":[
-						{
-							"row":1,
-							"col":1,
-							"Text":"包装单号"
-						},
-						{
-							"row":1,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#BoxNo#]",
-							"ColSpan":3
-						},
-						{
-							"row":2,
-							"col":1,
-							"Text":"物料描述",
-							"RowSpan":2
-						},
-						{
-							"row":2,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#PartName#]",
-							"ColSpan":3
-						},
-						{
-							"row":3,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#Des#]",
-							"ColSpan":2
-						},
-						{
-							"row":4,
-							"col":1,
-							"Text":"物料号"
-						},
-						{
-							"row":4,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#PartNo#]"
-						},
-						{
-							"row":4,
-							"col":3,
-							"FreeCell":true,
-							"Control":[
-								{
-									"Type":"Barcode",
-									"Name":"Barcode1",
-									"Top":0.211667,
-									"Width":2.01083,
-									"Height":2.19604,
-									"BarcodeType":"QRCode",
-									"CaptionPosition":"None",
-									"Text":"[#BoxNo#]",
-									"QRCodeErrorLevel":3
-								}
-							],
-							"ColSpan":2,
-							"RowSpan":3
-						},
-						{
-							"row":5,
-							"col":1,
-							"Text":"批次"
-						},
-						{
-							"row":5,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#BatchNo#]"
-						}
-					]
-				}
-			]
-		}
-	]
-}
\ No newline at end of file
diff --git a/PurchingMistakeNew/Report/X247 右侧后门板.grf b/PurchingMistakeNew/Report/X247 右侧后门板.grf
deleted file mode 100644
index 0b3d8bc..0000000
--- a/PurchingMistakeNew/Report/X247 右侧后门板.grf	
+++ /dev/null
@@ -1,222 +0,0 @@
-{
-	"Version":"6.6.2.0",
-	"Font":{
-		"Name":"宋体",
-		"Size":105000,
-		"Weight":400,
-		"Charset":134
-	},
-	"Printer":{
-		"Size":256,
-		"Width":6,
-		"Height":7,
-		"LeftMargin":0,
-		"TopMargin":0,
-		"RightMargin":0,
-		"BottomMargin":0
-	},
-	"DetailGrid":{
-		"Recordset":{
-			"ConnectionString":"Provider=SQLOLEDB.1;Password=a1+;Persist Security Info=True;User ID=sa;Initial Catalog=BBMPT;Data Source=10.60.101.9;Use Procedure for Prepare=1;Auto Translate=True;Packet Size=4096;Workstation ID=AMW-PC;Use Encryption for Data=False;Tag with column collation when possible=False",
-			"QuerySQL":"SELECT * FROM [dbo].[tb_Assembly_247] WHERE SUBSTRING(PartNo,1,11) in('A2477305603','A2477305403','A2477305803') AND PrintTime IS NULL ORDER BY CreateTime",
-			"Field":[
-				{
-					"Name":"ID"
-				},
-				{
-					"Name":"PartNo"
-				},
-				{
-					"Name":"PartName"
-				},
-				{
-					"Name":"BatchNo"
-				},
-				{
-					"Name":"Color"
-				},
-				{
-					"Name":"ColorNo"
-				},
-				{
-					"Name":"PartType"
-				},
-				{
-					"Name":"Validity"
-				},
-				{
-					"Name":"ValidityDate"
-				},
-				{
-					"Name":"CreateTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"PrintTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"TapeBatchNo"
-				},
-				{
-					"Name":"Des"
-				}
-			]
-		},
-		"ColumnContent":{
-			"Height":0
-		},
-		"ColumnTitle":{
-			"Height":0
-		}
-	},
-	"PageFooter":{
-		"Height":0
-	},
-	"ReportHeader":[
-		{
-			"Name":"ReportHeader1",
-			"Height":5.79438,
-			"Control":[
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox1",
-					"Top":0.396875,
-					"Width":2.01083,
-					"Height":0.582083,
-					"Text":"规格型号："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox1",
-					"Top":0.79375,
-					"Width":6.00604,
-					"Height":0.396875,
-					"Font":{
-						"Name":"宋体",
-						"Size":120000,
-						"Weight":400,
-						"Charset":134
-					},
-					"DataField":"PartNo"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox2",
-					"Left":0.211667,
-					"Top":3.81,
-					"Width":0.978958,
-					"Height":0.582083,
-					"Text":"批次："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox2",
-					"Left":1.21708,
-					"Top":3.81,
-					"Width":1.79917,
-					"Height":0.396875,
-					"DataField":"BatchNo"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox3",
-					"Left":-0.15875,
-					"Top":1.19063,
-					"Width":5.37104,
-					"Height":0.582083,
-					"DataField":"PartName"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox3",
-					"Top":2.19604,
-					"Width":1.00542,
-					"Height":0.608542,
-					"Text":"车型："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox4",
-					"Left":1.24354,
-					"Top":2.19604,
-					"Width":4.20688,
-					"Height":0.608542,
-					"DataField":"PartType"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox4",
-					"Top":2.61938,
-					"Width":2.40771,
-					"Height":0.79375,
-					"Text":"胶带有效期："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox5",
-					"Left":2.80458,
-					"Top":2.80458,
-					"Width":2.98979,
-					"Height":0.396875,
-					"DataField":"Validity"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox6",
-					"Left":-0.15875,
-					"Top":3.41313,
-					"Width":5.50333,
-					"Height":0.396875,
-					"DataField":"ValidityDate"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox5",
-					"Top":5.00063,
-					"Width":1.19063,
-					"Height":0.608542,
-					"Text":"颜色："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox7",
-					"Left":1.5875,
-					"Top":5.00063,
-					"Width":1.64042,
-					"Height":0.608542,
-					"DataField":"Color"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox8",
-					"Left":-0.15875,
-					"Top":4.41854,
-					"Width":2.03729,
-					"Height":0.582083,
-					"DataField":"ColorNo"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox9",
-					"Left":-0.15875,
-					"Top":1.77271,
-					"Width":5.00063,
-					"Height":0.423333,
-					"DataField":"Des"
-				},
-				{
-					"Type":"Barcode",
-					"Name":"Barcode1",
-					"Left":3.41313,
-					"Top":3.81,
-					"Width":2.38125,
-					"Height":2.01083,
-					"BarcodeType":"QRCode",
-					"CaptionPosition":"None",
-					"Text":"[#PartNo#]"
-				}
-			]
-		}
-	]
-}
\ No newline at end of file
diff --git a/PurchingMistakeNew/Report/X247 右侧后门板装箱单.grf b/PurchingMistakeNew/Report/X247 右侧后门板装箱单.grf
deleted file mode 100644
index 6d1ad13..0000000
--- a/PurchingMistakeNew/Report/X247 右侧后门板装箱单.grf	
+++ /dev/null
@@ -1,225 +0,0 @@
-{
-	"Version":"6.6.2.0",
-	"Font":{
-		"Name":"宋体",
-		"Size":105000,
-		"Weight":400,
-		"Charset":134
-	},
-	"Printer":{
-		"Size":256,
-		"Width":7,
-		"Height":6,
-		"LeftMargin":0,
-		"TopMargin":0,
-		"RightMargin":0,
-		"BottomMargin":0
-	},
-	"DetailGrid":{
-		"Recordset":{
-			"ConnectionString":"Provider=SQLOLEDB.1;Password=a1+;Persist Security Info=True;User ID=sa;Initial Catalog=BBMPT;Data Source=10.60.101.9;Use Procedure for Prepare=1;Auto Translate=True;Packet Size=4096;Workstation ID=AMW-PC;Use Encryption for Data=False;Tag with column collation when possible=False",
-			"QuerySQL":"SELECT * FROM [dbo].[tb_Box_247] WHERE PartNo in('A2477305603','A2477305403','A2477305803') AND [PrintTime] IS NULL  ORDER BY [CreateTime]",
-			"Field":[
-				{
-					"Name":"ID"
-				},
-				{
-					"Name":"BoxNo"
-				},
-				{
-					"Name":"PartNo"
-				},
-				{
-					"Name":"PartName"
-				},
-				{
-					"Name":"BatchNo"
-				},
-				{
-					"Name":"BoxCount",
-					"Type":"Float"
-				},
-				{
-					"Name":"CreateTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"PrintTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"Des"
-				}
-			]
-		},
-		"ColumnContent":{
-			"Height":0
-		},
-		"ColumnTitle":{
-			"Height":0
-		}
-	},
-	"PageFooter":{
-		"Height":0
-	},
-	"ReportHeader":[
-		{
-			"Name":"ReportHeader1",
-			"Height":5.21229,
-			"Control":[
-				{
-					"Type":"FreeGrid",
-					"Name":"FreeGrid1",
-					"Left":0.291042,
-					"Top":0.238125,
-					"Border":{
-						"Styles":"[DrawLeft|DrawTop|DrawRight|DrawBottom]"
-					},
-					"ColumnCount":4,
-					"RowCount":6,
-					"FreeGridColumn":[
-						{
-							"index":1,
-							"Width":1.71979
-						},
-						{
-							"index":2,
-							"Width":2.30188
-						},
-						{
-							"index":3,
-							"Width":2.2
-						},
-						{
-							"index":4,
-							"Width":0
-						}
-					],
-					"FreeGridRow":[
-						{
-							"index":1,
-							"Height":0.79375
-						},
-						{
-							"index":2,
-							"Height":0.635
-						},
-						{
-							"index":4,
-							"Height":1.05833
-						},
-						{
-							"index":5,
-							"Height":0.978958
-						},
-						{
-							"index":6,
-							"Height":0.767292
-						}
-					],
-					"FreeGridCell":[
-						{
-							"row":1,
-							"col":1,
-							"Text":"包装单号"
-						},
-						{
-							"row":1,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#BoxNo#]",
-							"ColSpan":3
-						},
-						{
-							"row":2,
-							"col":1,
-							"Text":"物料描述",
-							"RowSpan":2
-						},
-						{
-							"row":2,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#PartName#]",
-							"ColSpan":3
-						},
-						{
-							"row":3,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#Des#]",
-							"ColSpan":2
-						},
-						{
-							"row":4,
-							"col":1,
-							"Text":"物料号"
-						},
-						{
-							"row":4,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#PartNo#]"
-						},
-						{
-							"row":4,
-							"col":3,
-							"FreeCell":true,
-							"Control":[
-								{
-									"Type":"Barcode",
-									"Name":"Barcode1",
-									"Top":0.211667,
-									"Width":2.01083,
-									"Height":2.19604,
-									"BarcodeType":"QRCode",
-									"CaptionPosition":"None",
-									"Text":"[#BoxNo#]",
-									"QRCodeErrorLevel":3
-								}
-							],
-							"ColSpan":2,
-							"RowSpan":3
-						},
-						{
-							"row":5,
-							"col":1,
-							"Text":"批次"
-						},
-						{
-							"row":5,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#BatchNo#]"
-						}
-					]
-				}
-			]
-		}
-	]
-}
\ No newline at end of file
diff --git a/PurchingMistakeNew/Report/X247 左侧前门板.grf b/PurchingMistakeNew/Report/X247 左侧前门板.grf
deleted file mode 100644
index 5a2cef4..0000000
--- a/PurchingMistakeNew/Report/X247 左侧前门板.grf	
+++ /dev/null
@@ -1,225 +0,0 @@
-{
-	"Version":"6.6.2.0",
-	"Font":{
-		"Name":"宋体",
-		"Size":105000,
-		"Weight":400,
-		"Charset":134
-	},
-	"Printer":{
-		"Size":256,
-		"Width":6,
-		"Height":6,
-		"LeftMargin":0,
-		"TopMargin":0,
-		"RightMargin":0,
-		"BottomMargin":0
-	},
-	"DetailGrid":{
-		"Recordset":{
-			"ConnectionString":"Provider=SQLOLEDB.1;Password=a1+;Persist Security Info=True;User ID=sa;Initial Catalog=BBMPT;Data Source=10.60.101.9;Use Procedure for Prepare=1;Auto Translate=True;Packet Size=4096;Workstation ID=AMW-PC;Use Encryption for Data=False;Tag with column collation when possible=False",
-			"QuerySQL":"SELECT * FROM [dbo].[tb_Assembly_247] WHERE substring(PartNo,1,11) in ('A2477203007','A2477203207','A2477205006' )AND PrintTime IS NULL ORDER BY CreateTime",
-			"Field":[
-				{
-					"Name":"ID"
-				},
-				{
-					"Name":"PartNo"
-				},
-				{
-					"Name":"PartName"
-				},
-				{
-					"Name":"BatchNo"
-				},
-				{
-					"Name":"Color"
-				},
-				{
-					"Name":"ColorNo"
-				},
-				{
-					"Name":"PartType"
-				},
-				{
-					"Name":"Validity"
-				},
-				{
-					"Name":"ValidityDate"
-				},
-				{
-					"Name":"CreateTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"PrintTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"TapeBatchNo"
-				},
-				{
-					"Name":"Des"
-				}
-			]
-		},
-		"ColumnContent":{
-			"Height":0
-		},
-		"ColumnTitle":{
-			"Height":0
-		}
-	},
-	"PageFooter":{
-		"Height":0
-	},
-	"ReportHeader":[
-		{
-			"Name":"ReportHeader1",
-			"Height":5.79438,
-			"Control":[
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox1",
-					"Left":0.396875,
-					"Width":1.61396,
-					"Height":0.608542,
-					"Text":"规格型号："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox1",
-					"Left":0.211667,
-					"Top":0.608542,
-					"Width":5.97958,
-					"Height":0.396875,
-					"Font":{
-						"Name":"宋体",
-						"Size":120000,
-						"Weight":400,
-						"Charset":134
-					},
-					"DataField":"PartNo"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox2",
-					"Top":3.59833,
-					"Width":1.19063,
-					"Height":0.608542,
-					"Text":"批次："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox2",
-					"Left":1.40229,
-					"Top":3.59833,
-					"Width":1.79917,
-					"Height":0.396875,
-					"DataField":"BatchNo"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox3",
-					"Left":0.211667,
-					"Top":1.00542,
-					"Width":5.97958,
-					"Height":0.396875,
-					"DataField":"PartName"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox3",
-					"Left":0.0264583,
-					"Top":1.79917,
-					"Width":1.19063,
-					"Height":0.608542,
-					"Text":"车型："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox4",
-					"Left":1.42875,
-					"Top":1.79917,
-					"Width":4.20688,
-					"Height":0.608542,
-					"DataField":"PartType"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox4",
-					"Left":0.0264583,
-					"Top":2.40771,
-					"Width":2.16958,
-					"Height":0.79375,
-					"Text":"胶带有效期："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox5",
-					"Left":2.80458,
-					"Top":2.59292,
-					"Width":2.98979,
-					"Height":0.396875,
-					"DataField":"Validity"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox6",
-					"Left":0.0264583,
-					"Top":3.20146,
-					"Width":5.00063,
-					"Height":0.396875,
-					"DataField":"ValidityDate"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox5",
-					"Left":-0.0529167,
-					"Top":4.78896,
-					"Width":0.899583,
-					"Height":0.608542,
-					"Text":"颜色："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox7",
-					"Left":1.21708,
-					"Top":4.78896,
-					"Width":2.19604,
-					"Height":0.608542,
-					"DataField":"Color"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox8",
-					"Left":0.0264583,
-					"Top":4.20688,
-					"Width":2.59292,
-					"Height":0.582083,
-					"DataField":"ColorNo"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox9",
-					"Left":0.0264583,
-					"Top":1.40229,
-					"Width":5.60917,
-					"Height":0.396875,
-					"DataField":"Des"
-				},
-				{
-					"Type":"Barcode",
-					"Name":"Barcode1",
-					"Left":3.04271,
-					"Top":3.59833,
-					"Width":2.38125,
-					"Height":2.01083,
-					"BarcodeType":"QRCode",
-					"CaptionPosition":"None",
-					"Text":"[#PartNo#]"
-				}
-			]
-		}
-	]
-}
\ No newline at end of file
diff --git a/PurchingMistakeNew/Report/X247 左侧前门板装箱单.grf b/PurchingMistakeNew/Report/X247 左侧前门板装箱单.grf
deleted file mode 100644
index 4b7dbb0..0000000
--- a/PurchingMistakeNew/Report/X247 左侧前门板装箱单.grf	
+++ /dev/null
@@ -1,241 +0,0 @@
-{
-	"Version":"6.6.2.0",
-	"Font":{
-		"Name":"宋体",
-		"Size":105000,
-		"Weight":400,
-		"Charset":134
-	},
-	"Printer":{
-		"Size":256,
-		"Width":7,
-		"Height":6,
-		"LeftMargin":0,
-		"TopMargin":0,
-		"RightMargin":0,
-		"BottomMargin":0
-	},
-	"DetailGrid":{
-		"Recordset":{
-			"ConnectionString":"Provider=SQLOLEDB.1;Password=a1+;Persist Security Info=True;User ID=sa;Initial Catalog=BBMPT;Data Source=10.60.101.9;Use Procedure for Prepare=1;Auto Translate=True;Packet Size=4096;Workstation ID=AMW-PC;Use Encryption for Data=False;Tag with column collation when possible=False",
-			"QuerySQL":"SELECT * FROM [dbo].[tb_Box_247] WHERE PartNo in('A2477204606','A2477204806','A2477205006') AND [PrintTime] IS NULL  ORDER BY [CreateTime]",
-			"Field":[
-				{
-					"Name":"ID"
-				},
-				{
-					"Name":"BoxNo"
-				},
-				{
-					"Name":"PartNo"
-				},
-				{
-					"Name":"PartName"
-				},
-				{
-					"Name":"BatchNo"
-				},
-				{
-					"Name":"BoxCount",
-					"Type":"Float"
-				},
-				{
-					"Name":"CreateTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"PrintTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"Des"
-				}
-			]
-		},
-		"ColumnContent":{
-			"Height":0
-		},
-		"ColumnTitle":{
-			"Height":0
-		}
-	},
-	"PageFooter":{
-		"Height":0
-	},
-	"ReportHeader":[
-		{
-			"Name":"ReportHeader1",
-			"Height":5.21229,
-			"Control":[
-				{
-					"Type":"FreeGrid",
-					"Name":"FreeGrid1",
-					"Left":0.291042,
-					"Top":0.238125,
-					"Border":{
-						"Styles":"[DrawLeft|DrawTop|DrawRight|DrawBottom]"
-					},
-					"ColumnCount":4,
-					"RowCount":6,
-					"FreeGridColumn":[
-						{
-							"index":1,
-							"Width":1.71979
-						},
-						{
-							"index":2,
-							"Width":2.30188
-						},
-						{
-							"index":3,
-							"Width":2.2
-						},
-						{
-							"index":4,
-							"Width":0
-						}
-					],
-					"FreeGridRow":[
-						{
-							"index":1,
-							"Height":0.661458
-						},
-						{
-							"index":2,
-							"Height":0.555625
-						},
-						{
-							"index":4,
-							"Height":1.05833
-						},
-						{
-							"index":5,
-							"Height":0.978958
-						},
-						{
-							"index":6,
-							"Height":0.767292
-						}
-					],
-					"FreeGridCell":[
-						{
-							"row":1,
-							"col":1,
-							"Text":"包装单号"
-						},
-						{
-							"row":1,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#BoxNo#]",
-							"ColSpan":3
-						},
-						{
-							"row":2,
-							"col":1,
-							"Text":"物料描述",
-							"RowSpan":2
-						},
-						{
-							"row":2,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#PartName#]",
-							"ColSpan":3
-						},
-						{
-							"row":3,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#Des#]",
-							"ColSpan":2
-						},
-						{
-							"row":4,
-							"col":1,
-							"Text":"物料号"
-						},
-						{
-							"row":4,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#PartNo#]"
-						},
-						{
-							"row":4,
-							"col":3,
-							"FreeCell":true,
-							"Control":[
-								{
-									"Type":"Barcode",
-									"Name":"Barcode1",
-									"Top":0.211667,
-									"Width":2.01083,
-									"Height":2.19604,
-									"BarcodeType":"QRCode",
-									"CaptionPosition":"None",
-									"Text":"[#BoxNo#]",
-									"QRCodeErrorLevel":3
-								}
-							],
-							"ColSpan":2,
-							"RowSpan":3
-						},
-						{
-							"row":5,
-							"col":1,
-							"Text":"批次"
-						},
-						{
-							"row":5,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#BatchNo#]"
-						},
-						{
-							"row":6,
-							"col":1,
-							"Text":"包装数量"
-						},
-						{
-							"row":6,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#BoxCount#]"
-						}
-					]
-				}
-			]
-		}
-	]
-}
\ No newline at end of file
diff --git a/PurchingMistakeNew/Report/X247 左侧后门板.grf b/PurchingMistakeNew/Report/X247 左侧后门板.grf
deleted file mode 100644
index aa1c9e4..0000000
--- a/PurchingMistakeNew/Report/X247 左侧后门板.grf	
+++ /dev/null
@@ -1,225 +0,0 @@
-{
-	"Version":"6.6.2.0",
-	"Font":{
-		"Name":"宋体",
-		"Size":105000,
-		"Weight":400,
-		"Charset":134
-	},
-	"Printer":{
-		"Size":256,
-		"Width":6,
-		"Height":7,
-		"LeftMargin":0,
-		"TopMargin":0,
-		"RightMargin":0,
-		"BottomMargin":0
-	},
-	"DetailGrid":{
-		"Recordset":{
-			"ConnectionString":"Provider=SQLOLEDB.1;Password=a1+;Persist Security Info=True;User ID=sa;Initial Catalog=BBMPT;Data Source=10.60.101.9;Use Procedure for Prepare=1;Auto Translate=True;Packet Size=4096;Workstation ID=AMW-PC;Use Encryption for Data=False;Tag with column collation when possible=False",
-			"QuerySQL":"SELECT * FROM [dbo].[tb_Assembly_247] WHERE substring(PartNo,1,11 ) in('A2477305303','A2477305503','A2477305703') AND PrintTime IS NULL ORDER BY CreateTime",
-			"Field":[
-				{
-					"Name":"ID"
-				},
-				{
-					"Name":"PartNo"
-				},
-				{
-					"Name":"PartName"
-				},
-				{
-					"Name":"BatchNo"
-				},
-				{
-					"Name":"Color"
-				},
-				{
-					"Name":"ColorNo"
-				},
-				{
-					"Name":"PartType"
-				},
-				{
-					"Name":"Validity"
-				},
-				{
-					"Name":"ValidityDate"
-				},
-				{
-					"Name":"CreateTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"PrintTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"TapeBatchNo"
-				},
-				{
-					"Name":"Des"
-				}
-			]
-		},
-		"ColumnContent":{
-			"Height":0
-		},
-		"ColumnTitle":{
-			"Height":0
-		}
-	},
-	"PageFooter":{
-		"Height":0
-	},
-	"ReportHeader":[
-		{
-			"Name":"ReportHeader1",
-			"Height":5.79438,
-			"Control":[
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox1",
-					"Top":0.185208,
-					"Width":1.5875,
-					"Height":0.608542,
-					"Text":"规格型号："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox1",
-					"Left":0.211667,
-					"Top":0.79375,
-					"Width":5.58271,
-					"Height":0.396875,
-					"Font":{
-						"Name":"宋体",
-						"Size":120000,
-						"Weight":400,
-						"Charset":134
-					},
-					"DataField":"PartNo"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox2",
-					"Top":3.70417,
-					"Width":1.19063,
-					"Height":0.608542,
-					"Text":"批次："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox2",
-					"Left":1.40229,
-					"Top":3.70417,
-					"Width":1.79917,
-					"Height":0.396875,
-					"DataField":"BatchNo"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox3",
-					"Left":0.211667,
-					"Top":1.19063,
-					"Width":5.97958,
-					"Height":0.582083,
-					"DataField":"PartName"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox3",
-					"Left":0.0264583,
-					"Top":2.19604,
-					"Width":1.19063,
-					"Height":0.608542,
-					"Text":"车型："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox4",
-					"Left":1.40229,
-					"Top":2.19604,
-					"Width":4.20688,
-					"Height":0.608542,
-					"DataField":"PartType"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox4",
-					"Left":0.0264583,
-					"Top":2.51354,
-					"Width":2.38125,
-					"Height":0.79375,
-					"Text":"胶带有效期："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox5",
-					"Left":2.40771,
-					"Top":2.69875,
-					"Width":2.98979,
-					"Height":0.396875,
-					"DataField":"Validity"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox6",
-					"Left":0.0264583,
-					"Top":3.41313,
-					"Width":5.00063,
-					"Height":0.396875,
-					"DataField":"ValidityDate"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox5",
-					"Left":-0.0529167,
-					"Top":4.89479,
-					"Width":0.820208,
-					"Height":0.608542,
-					"Text":"颜色："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox7",
-					"Left":1.21708,
-					"Top":4.89479,
-					"Width":2.19604,
-					"Height":0.608542,
-					"DataField":"Color"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox8",
-					"Left":0.0264583,
-					"Top":4.31271,
-					"Width":2.59292,
-					"Height":0.582083,
-					"DataField":"ColorNo"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox9",
-					"Left":0.211667,
-					"Top":1.5875,
-					"Width":5.58271,
-					"Height":0.502708,
-					"DataField":"Des"
-				},
-				{
-					"Type":"Barcode",
-					"Name":"Barcode1",
-					"Left":3.04271,
-					"Top":3.70417,
-					"Width":2.38125,
-					"Height":2.01083,
-					"BarcodeType":"QRCode",
-					"CaptionPosition":"None",
-					"Text":"[#PartNo#]"
-				}
-			]
-		}
-	]
-}
\ No newline at end of file
diff --git a/PurchingMistakeNew/Report/X247 左侧后门板装箱单.grf b/PurchingMistakeNew/Report/X247 左侧后门板装箱单.grf
deleted file mode 100644
index 96734c5..0000000
--- a/PurchingMistakeNew/Report/X247 左侧后门板装箱单.grf	
+++ /dev/null
@@ -1,241 +0,0 @@
-{
-	"Version":"6.6.2.0",
-	"Font":{
-		"Name":"宋体",
-		"Size":105000,
-		"Weight":400,
-		"Charset":134
-	},
-	"Printer":{
-		"Size":256,
-		"Width":7,
-		"Height":6,
-		"LeftMargin":0,
-		"TopMargin":0,
-		"RightMargin":0,
-		"BottomMargin":0
-	},
-	"DetailGrid":{
-		"Recordset":{
-			"ConnectionString":"Provider=SQLOLEDB.1;Password=a1+;Persist Security Info=True;User ID=sa;Initial Catalog=BBMPT;Data Source=10.60.101.9;Use Procedure for Prepare=1;Auto Translate=True;Packet Size=4096;Workstation ID=AMW-PC;Use Encryption for Data=False;Tag with column collation when possible=False",
-			"QuerySQL":"SELECT * FROM [dbo].[tb_Box_247] WHERE PartNo in('A2477305303','A2477305503','A2477305703') AND [PrintTime] IS NULL  ORDER BY [CreateTime]",
-			"Field":[
-				{
-					"Name":"ID"
-				},
-				{
-					"Name":"BoxNo"
-				},
-				{
-					"Name":"PartNo"
-				},
-				{
-					"Name":"PartName"
-				},
-				{
-					"Name":"BatchNo"
-				},
-				{
-					"Name":"BoxCount",
-					"Type":"Float"
-				},
-				{
-					"Name":"CreateTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"PrintTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"Des"
-				}
-			]
-		},
-		"ColumnContent":{
-			"Height":0
-		},
-		"ColumnTitle":{
-			"Height":0
-		}
-	},
-	"PageFooter":{
-		"Height":0
-	},
-	"ReportHeader":[
-		{
-			"Name":"ReportHeader1",
-			"Height":5.21229,
-			"Control":[
-				{
-					"Type":"FreeGrid",
-					"Name":"FreeGrid1",
-					"Left":0.291042,
-					"Top":0.238125,
-					"Border":{
-						"Styles":"[DrawLeft|DrawTop|DrawRight|DrawBottom]"
-					},
-					"ColumnCount":4,
-					"RowCount":6,
-					"FreeGridColumn":[
-						{
-							"index":1,
-							"Width":1.71979
-						},
-						{
-							"index":2,
-							"Width":2.30188
-						},
-						{
-							"index":3,
-							"Width":2.2
-						},
-						{
-							"index":4,
-							"Width":0
-						}
-					],
-					"FreeGridRow":[
-						{
-							"index":1,
-							"Height":0.714375
-						},
-						{
-							"index":2,
-							"Height":0.661458
-						},
-						{
-							"index":4,
-							"Height":1.05833
-						},
-						{
-							"index":5,
-							"Height":0.978958
-						},
-						{
-							"index":6,
-							"Height":0.767292
-						}
-					],
-					"FreeGridCell":[
-						{
-							"row":1,
-							"col":1,
-							"Text":"包装单号"
-						},
-						{
-							"row":1,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#BoxNo#]",
-							"ColSpan":3
-						},
-						{
-							"row":2,
-							"col":1,
-							"Text":"物料描述",
-							"RowSpan":2
-						},
-						{
-							"row":2,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#PartName#]",
-							"ColSpan":3
-						},
-						{
-							"row":3,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#Des#]",
-							"ColSpan":2
-						},
-						{
-							"row":4,
-							"col":1,
-							"Text":"物料号"
-						},
-						{
-							"row":4,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#PartNo#]"
-						},
-						{
-							"row":4,
-							"col":3,
-							"FreeCell":true,
-							"Control":[
-								{
-									"Type":"Barcode",
-									"Name":"Barcode1",
-									"Top":0.211667,
-									"Width":2.01083,
-									"Height":2.19604,
-									"BarcodeType":"QRCode",
-									"CaptionPosition":"None",
-									"Text":"[#BoxNo#]",
-									"QRCodeErrorLevel":3
-								}
-							],
-							"ColSpan":2,
-							"RowSpan":3
-						},
-						{
-							"row":5,
-							"col":1,
-							"Text":"批次"
-						},
-						{
-							"row":5,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#BatchNo#]"
-						},
-						{
-							"row":6,
-							"col":1,
-							"Text":"包装数量"
-						},
-						{
-							"row":6,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#BoxCount#]"
-						}
-					]
-				}
-			]
-		}
-	]
-}
\ No newline at end of file
diff --git a/PurchingMistakeNew/Report/X247右侧前门板1.grf b/PurchingMistakeNew/Report/X247右侧前门板1.grf
deleted file mode 100644
index 5f9bd23..0000000
--- a/PurchingMistakeNew/Report/X247右侧前门板1.grf
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-	"Version":"6.6.2.0",
-	"Font":{
-		"Name":"宋体",
-		"Size":105000,
-		"Weight":400,
-		"Charset":134
-	},
-	"Printer":{
-		"Size":256,
-		"Width":6,
-		"Height":7,
-		"LeftMargin":0,
-		"TopMargin":0,
-		"RightMargin":0,
-		"BottomMargin":0
-	},
-	"DetailGrid":{
-		"Recordset":{
-			"ConnectionString":"Provider=SQLOLEDB.1;Password=a1+;Persist Security Info=True;User ID=sa;Initial Catalog=BBMPT;Data Source=10.60.101.9;Use Procedure for Prepare=1;Auto Translate=True;Packet Size=4096;Workstation ID=AMW-PC;Use Encryption for Data=False;Tag with column collation when possible=False",
-			"QuerySQL":"SELECT * FROM [dbo].[tb_Assembly_247] WHERE SUBSTRING(PartNo,1,11) in ('A2477203107','A2477203307','A2477205106' )AND PrintTime IS NULL ORDER BY CreateTime",
-			"Field":[
-				{
-					"Name":"ID"
-				},
-				{
-					"Name":"PartNo"
-				},
-				{
-					"Name":"PartName"
-				},
-				{
-					"Name":"BatchNo"
-				},
-				{
-					"Name":"Color"
-				},
-				{
-					"Name":"ColorNo"
-				},
-				{
-					"Name":"PartType"
-				},
-				{
-					"Name":"Validity"
-				},
-				{
-					"Name":"ValidityDate"
-				},
-				{
-					"Name":"CreateTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"PrintTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"TapeBatchNo"
-				},
-				{
-					"Name":"Des"
-				}
-			]
-		},
-		"ColumnContent":{
-			"Height":0
-		},
-		"ColumnTitle":{
-			"Height":0
-		}
-	},
-	"PageFooter":{
-		"Height":0
-	},
-	"ReportHeader":[
-		{
-			"Name":"ReportHeader1",
-			"Height":6.00604,
-			"Control":[
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox1",
-					"Top":0.343958,
-					"Width":1.79917,
-					"Height":0.582083,
-					"Text":"规格型号："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox1",
-					"Top":0.926042,
-					"Width":6.00604,
-					"Height":0.396875,
-					"Font":{
-						"Name":"宋体",
-						"Size":120000,
-						"Weight":400,
-						"Charset":134
-					},
-					"DataField":"PartNo"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox2",
-					"Left":0.211667,
-					"Top":3.96875,
-					"Width":0.978958,
-					"Height":0.608542,
-					"Text":"批次："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox2",
-					"Left":1.21708,
-					"Top":3.96875,
-					"Width":1.79917,
-					"Height":0.396875,
-					"DataField":"BatchNo"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox3",
-					"Top":1.32292,
-					"Width":5.60917,
-					"Height":0.608542,
-					"DataField":"PartName"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox3",
-					"Top":2.30188,
-					"Width":1.19063,
-					"Height":0.608542,
-					"Text":"车型："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox4",
-					"Left":1.24354,
-					"Top":2.30188,
-					"Width":4.20688,
-					"Height":0.608542,
-					"DataField":"PartType"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox4",
-					"Left":0.396875,
-					"Top":2.77813,
-					"Width":2.01083,
-					"Height":0.79375,
-					"Text":"胶带有效期："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox5",
-					"Left":2.80458,
-					"Top":2.98979,
-					"Width":2.98979,
-					"Height":0.423333,
-					"DataField":"Validity"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox6",
-					"Left":-0.15875,
-					"Top":3.57188,
-					"Width":5.90021,
-					"Height":0.396875,
-					"DataField":"ValidityDate"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox5",
-					"Left":0.211667,
-					"Top":5.15938,
-					"Width":0.978958,
-					"Height":0.608542,
-					"Text":"颜色："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox7",
-					"Left":1.19063,
-					"Top":5.15938,
-					"Width":1.61396,
-					"Height":0.608542,
-					"DataField":"Color"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox8",
-					"Left":-0.15875,
-					"Top":4.57729,
-					"Width":2.24896,
-					"Height":0.582083,
-					"DataField":"ColorNo"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox9",
-					"Left":-0.132292,
-					"Top":1.71979,
-					"Width":5.18583,
-					"Height":0.582083,
-					"DataField":"Des"
-				},
-				{
-					"Type":"Barcode",
-					"Name":"Barcode1",
-					"Left":2.8575,
-					"Top":3.96875,
-					"Width":2.38125,
-					"Height":2.01083,
-					"BarcodeType":"QRCode",
-					"CaptionPosition":"None",
-					"Text":"[#PartNo#]"
-				}
-			]
-		}
-	]
-}
\ No newline at end of file
diff --git a/PurchingMistakeNew/Report/X247右侧前门板装箱单.grf b/PurchingMistakeNew/Report/X247右侧前门板装箱单.grf
deleted file mode 100644
index 64461cd..0000000
--- a/PurchingMistakeNew/Report/X247右侧前门板装箱单.grf
+++ /dev/null
@@ -1,221 +0,0 @@
-{
-	"Version":"6.6.2.0",
-	"Font":{
-		"Name":"宋体",
-		"Size":105000,
-		"Weight":400,
-		"Charset":134
-	},
-	"Printer":{
-		"Size":256,
-		"Width":7,
-		"Height":6,
-		"LeftMargin":0,
-		"TopMargin":0,
-		"RightMargin":0,
-		"BottomMargin":0
-	},
-	"DetailGrid":{
-		"Recordset":{
-			"ConnectionString":"Provider=SQLOLEDB.1;Password=a1+;Persist Security Info=True;User ID=sa;Initial Catalog=BBMPT;Data Source=10.60.101.9;Use Procedure for Prepare=1;Auto Translate=True;Packet Size=4096;Workstation ID=AMW-PC;Use Encryption for Data=False;Tag with column collation when possible=False",
-			"QuerySQL":"SELECT * FROM [dbo].[tb_Box_247] WHERE PartNo in('A2477204706','A2477204906','A2477205106') AND [PrintTime] IS NULL  ORDER BY [CreateTime]",
-			"Field":[
-				{
-					"Name":"ID"
-				},
-				{
-					"Name":"BoxNo"
-				},
-				{
-					"Name":"PartNo"
-				},
-				{
-					"Name":"PartName"
-				},
-				{
-					"Name":"BatchNo"
-				},
-				{
-					"Name":"BoxCount",
-					"Type":"Float"
-				},
-				{
-					"Name":"CreateTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"PrintTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"Des"
-				}
-			]
-		},
-		"ColumnContent":{
-			"Height":0
-		},
-		"ColumnTitle":{
-			"Height":0
-		}
-	},
-	"PageFooter":{
-		"Height":0
-	},
-	"ReportHeader":[
-		{
-			"Name":"ReportHeader1",
-			"Height":5.21229,
-			"Control":[
-				{
-					"Type":"FreeGrid",
-					"Name":"FreeGrid1",
-					"Left":0.291042,
-					"Top":0.238125,
-					"Border":{
-						"Styles":"[DrawLeft|DrawTop|DrawRight|DrawBottom]"
-					},
-					"ColumnCount":4,
-					"RowCount":6,
-					"FreeGridColumn":[
-						{
-							"index":1,
-							"Width":1.71979
-						},
-						{
-							"index":2,
-							"Width":2.30188
-						},
-						{
-							"index":3,
-							"Width":2.2
-						},
-						{
-							"index":4,
-							"Width":0
-						}
-					],
-					"FreeGridRow":[
-						{
-							"index":1,
-							"Height":0.79375
-						},
-						{
-							"index":4,
-							"Height":1.05833
-						},
-						{
-							"index":5,
-							"Height":0.978958
-						},
-						{
-							"index":6,
-							"Height":0.767292
-						}
-					],
-					"FreeGridCell":[
-						{
-							"row":1,
-							"col":1,
-							"Text":"包装单号"
-						},
-						{
-							"row":1,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#BoxNo#]",
-							"ColSpan":3
-						},
-						{
-							"row":2,
-							"col":1,
-							"Text":"物料描述",
-							"RowSpan":2
-						},
-						{
-							"row":2,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#PartName#]",
-							"ColSpan":3
-						},
-						{
-							"row":3,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#Des#]",
-							"ColSpan":2
-						},
-						{
-							"row":4,
-							"col":1,
-							"Text":"物料号"
-						},
-						{
-							"row":4,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#PartNo#]"
-						},
-						{
-							"row":4,
-							"col":3,
-							"FreeCell":true,
-							"Control":[
-								{
-									"Type":"Barcode",
-									"Name":"Barcode1",
-									"Top":0.211667,
-									"Width":2.01083,
-									"Height":2.19604,
-									"BarcodeType":"QRCode",
-									"CaptionPosition":"None",
-									"Text":"[#BoxNo#]",
-									"QRCodeErrorLevel":3
-								}
-							],
-							"ColSpan":2,
-							"RowSpan":3
-						},
-						{
-							"row":5,
-							"col":1,
-							"Text":"批次"
-						},
-						{
-							"row":5,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#BatchNo#]"
-						}
-					]
-				}
-			]
-		}
-	]
-}
\ No newline at end of file
diff --git a/PurchingMistakeNew/Report/X247右侧后门板1.grf b/PurchingMistakeNew/Report/X247右侧后门板1.grf
deleted file mode 100644
index 0b3d8bc..0000000
--- a/PurchingMistakeNew/Report/X247右侧后门板1.grf
+++ /dev/null
@@ -1,222 +0,0 @@
-{
-	"Version":"6.6.2.0",
-	"Font":{
-		"Name":"宋体",
-		"Size":105000,
-		"Weight":400,
-		"Charset":134
-	},
-	"Printer":{
-		"Size":256,
-		"Width":6,
-		"Height":7,
-		"LeftMargin":0,
-		"TopMargin":0,
-		"RightMargin":0,
-		"BottomMargin":0
-	},
-	"DetailGrid":{
-		"Recordset":{
-			"ConnectionString":"Provider=SQLOLEDB.1;Password=a1+;Persist Security Info=True;User ID=sa;Initial Catalog=BBMPT;Data Source=10.60.101.9;Use Procedure for Prepare=1;Auto Translate=True;Packet Size=4096;Workstation ID=AMW-PC;Use Encryption for Data=False;Tag with column collation when possible=False",
-			"QuerySQL":"SELECT * FROM [dbo].[tb_Assembly_247] WHERE SUBSTRING(PartNo,1,11) in('A2477305603','A2477305403','A2477305803') AND PrintTime IS NULL ORDER BY CreateTime",
-			"Field":[
-				{
-					"Name":"ID"
-				},
-				{
-					"Name":"PartNo"
-				},
-				{
-					"Name":"PartName"
-				},
-				{
-					"Name":"BatchNo"
-				},
-				{
-					"Name":"Color"
-				},
-				{
-					"Name":"ColorNo"
-				},
-				{
-					"Name":"PartType"
-				},
-				{
-					"Name":"Validity"
-				},
-				{
-					"Name":"ValidityDate"
-				},
-				{
-					"Name":"CreateTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"PrintTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"TapeBatchNo"
-				},
-				{
-					"Name":"Des"
-				}
-			]
-		},
-		"ColumnContent":{
-			"Height":0
-		},
-		"ColumnTitle":{
-			"Height":0
-		}
-	},
-	"PageFooter":{
-		"Height":0
-	},
-	"ReportHeader":[
-		{
-			"Name":"ReportHeader1",
-			"Height":5.79438,
-			"Control":[
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox1",
-					"Top":0.396875,
-					"Width":2.01083,
-					"Height":0.582083,
-					"Text":"规格型号："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox1",
-					"Top":0.79375,
-					"Width":6.00604,
-					"Height":0.396875,
-					"Font":{
-						"Name":"宋体",
-						"Size":120000,
-						"Weight":400,
-						"Charset":134
-					},
-					"DataField":"PartNo"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox2",
-					"Left":0.211667,
-					"Top":3.81,
-					"Width":0.978958,
-					"Height":0.582083,
-					"Text":"批次："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox2",
-					"Left":1.21708,
-					"Top":3.81,
-					"Width":1.79917,
-					"Height":0.396875,
-					"DataField":"BatchNo"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox3",
-					"Left":-0.15875,
-					"Top":1.19063,
-					"Width":5.37104,
-					"Height":0.582083,
-					"DataField":"PartName"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox3",
-					"Top":2.19604,
-					"Width":1.00542,
-					"Height":0.608542,
-					"Text":"车型："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox4",
-					"Left":1.24354,
-					"Top":2.19604,
-					"Width":4.20688,
-					"Height":0.608542,
-					"DataField":"PartType"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox4",
-					"Top":2.61938,
-					"Width":2.40771,
-					"Height":0.79375,
-					"Text":"胶带有效期："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox5",
-					"Left":2.80458,
-					"Top":2.80458,
-					"Width":2.98979,
-					"Height":0.396875,
-					"DataField":"Validity"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox6",
-					"Left":-0.15875,
-					"Top":3.41313,
-					"Width":5.50333,
-					"Height":0.396875,
-					"DataField":"ValidityDate"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox5",
-					"Top":5.00063,
-					"Width":1.19063,
-					"Height":0.608542,
-					"Text":"颜色："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox7",
-					"Left":1.5875,
-					"Top":5.00063,
-					"Width":1.64042,
-					"Height":0.608542,
-					"DataField":"Color"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox8",
-					"Left":-0.15875,
-					"Top":4.41854,
-					"Width":2.03729,
-					"Height":0.582083,
-					"DataField":"ColorNo"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox9",
-					"Left":-0.15875,
-					"Top":1.77271,
-					"Width":5.00063,
-					"Height":0.423333,
-					"DataField":"Des"
-				},
-				{
-					"Type":"Barcode",
-					"Name":"Barcode1",
-					"Left":3.41313,
-					"Top":3.81,
-					"Width":2.38125,
-					"Height":2.01083,
-					"BarcodeType":"QRCode",
-					"CaptionPosition":"None",
-					"Text":"[#PartNo#]"
-				}
-			]
-		}
-	]
-}
\ No newline at end of file
diff --git a/PurchingMistakeNew/Report/X247右侧后门板装箱单.grf b/PurchingMistakeNew/Report/X247右侧后门板装箱单.grf
deleted file mode 100644
index 6d1ad13..0000000
--- a/PurchingMistakeNew/Report/X247右侧后门板装箱单.grf
+++ /dev/null
@@ -1,225 +0,0 @@
-{
-	"Version":"6.6.2.0",
-	"Font":{
-		"Name":"宋体",
-		"Size":105000,
-		"Weight":400,
-		"Charset":134
-	},
-	"Printer":{
-		"Size":256,
-		"Width":7,
-		"Height":6,
-		"LeftMargin":0,
-		"TopMargin":0,
-		"RightMargin":0,
-		"BottomMargin":0
-	},
-	"DetailGrid":{
-		"Recordset":{
-			"ConnectionString":"Provider=SQLOLEDB.1;Password=a1+;Persist Security Info=True;User ID=sa;Initial Catalog=BBMPT;Data Source=10.60.101.9;Use Procedure for Prepare=1;Auto Translate=True;Packet Size=4096;Workstation ID=AMW-PC;Use Encryption for Data=False;Tag with column collation when possible=False",
-			"QuerySQL":"SELECT * FROM [dbo].[tb_Box_247] WHERE PartNo in('A2477305603','A2477305403','A2477305803') AND [PrintTime] IS NULL  ORDER BY [CreateTime]",
-			"Field":[
-				{
-					"Name":"ID"
-				},
-				{
-					"Name":"BoxNo"
-				},
-				{
-					"Name":"PartNo"
-				},
-				{
-					"Name":"PartName"
-				},
-				{
-					"Name":"BatchNo"
-				},
-				{
-					"Name":"BoxCount",
-					"Type":"Float"
-				},
-				{
-					"Name":"CreateTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"PrintTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"Des"
-				}
-			]
-		},
-		"ColumnContent":{
-			"Height":0
-		},
-		"ColumnTitle":{
-			"Height":0
-		}
-	},
-	"PageFooter":{
-		"Height":0
-	},
-	"ReportHeader":[
-		{
-			"Name":"ReportHeader1",
-			"Height":5.21229,
-			"Control":[
-				{
-					"Type":"FreeGrid",
-					"Name":"FreeGrid1",
-					"Left":0.291042,
-					"Top":0.238125,
-					"Border":{
-						"Styles":"[DrawLeft|DrawTop|DrawRight|DrawBottom]"
-					},
-					"ColumnCount":4,
-					"RowCount":6,
-					"FreeGridColumn":[
-						{
-							"index":1,
-							"Width":1.71979
-						},
-						{
-							"index":2,
-							"Width":2.30188
-						},
-						{
-							"index":3,
-							"Width":2.2
-						},
-						{
-							"index":4,
-							"Width":0
-						}
-					],
-					"FreeGridRow":[
-						{
-							"index":1,
-							"Height":0.79375
-						},
-						{
-							"index":2,
-							"Height":0.635
-						},
-						{
-							"index":4,
-							"Height":1.05833
-						},
-						{
-							"index":5,
-							"Height":0.978958
-						},
-						{
-							"index":6,
-							"Height":0.767292
-						}
-					],
-					"FreeGridCell":[
-						{
-							"row":1,
-							"col":1,
-							"Text":"包装单号"
-						},
-						{
-							"row":1,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#BoxNo#]",
-							"ColSpan":3
-						},
-						{
-							"row":2,
-							"col":1,
-							"Text":"物料描述",
-							"RowSpan":2
-						},
-						{
-							"row":2,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#PartName#]",
-							"ColSpan":3
-						},
-						{
-							"row":3,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#Des#]",
-							"ColSpan":2
-						},
-						{
-							"row":4,
-							"col":1,
-							"Text":"物料号"
-						},
-						{
-							"row":4,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#PartNo#]"
-						},
-						{
-							"row":4,
-							"col":3,
-							"FreeCell":true,
-							"Control":[
-								{
-									"Type":"Barcode",
-									"Name":"Barcode1",
-									"Top":0.211667,
-									"Width":2.01083,
-									"Height":2.19604,
-									"BarcodeType":"QRCode",
-									"CaptionPosition":"None",
-									"Text":"[#BoxNo#]",
-									"QRCodeErrorLevel":3
-								}
-							],
-							"ColSpan":2,
-							"RowSpan":3
-						},
-						{
-							"row":5,
-							"col":1,
-							"Text":"批次"
-						},
-						{
-							"row":5,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#BatchNo#]"
-						}
-					]
-				}
-			]
-		}
-	]
-}
\ No newline at end of file
diff --git a/PurchingMistakeNew/Report/X247后部中间扰流板.grf b/PurchingMistakeNew/Report/X247后部中间扰流板.grf
deleted file mode 100644
index f2cd63b..0000000
--- a/PurchingMistakeNew/Report/X247后部中间扰流板.grf
+++ /dev/null
@@ -1,268 +0,0 @@
-{
-	"Version":"6.6.2.0",
-	"Font":{
-		"Name":"宋体",
-		"Size":105000,
-		"Weight":400,
-		"Charset":134
-	},
-	"Printer":{
-		"Size":256,
-		"Width":7,
-		"Height":8,
-		"Oriention":"Landscape",
-		"LeftMargin":0,
-		"TopMargin":0,
-		"RightMargin":0,
-		"BottomMargin":0
-	},
-	"DetailGrid":{
-		"Recordset":{
-			"ConnectionString":"Provider=SQLOLEDB.1;Password=a1+;Persist Security Info=True;User ID=sa;Initial Catalog=BBMPT;Data Source=10.60.101.9;Use Procedure for Prepare=1;Auto Translate=True;Packet Size=4096;Workstation ID=AMW-PC;Use Encryption for Data=False;Tag with column collation when possible=False",
-			"QuerySQL":"SELECT * FROM [dbo].[tb_Assembly_247] WHERE PartNo='A2477900588' AND PrintTime IS NULL ORDER BY CreateTime",
-			"Field":[
-				{
-					"Name":"ID"
-				},
-				{
-					"Name":"PartNo"
-				},
-				{
-					"Name":"PartName"
-				},
-				{
-					"Name":"BatchNo"
-				},
-				{
-					"Name":"Color"
-				},
-				{
-					"Name":"ColorNo"
-				},
-				{
-					"Name":"PartType"
-				},
-				{
-					"Name":"Validity"
-				},
-				{
-					"Name":"ValidityDate"
-				},
-				{
-					"Name":"CreateTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"PrintTime",
-					"Type":"DateTime"
-				}
-			]
-		},
-		"ColumnContent":{
-			"Height":0
-		},
-		"ColumnTitle":{
-			"Height":0
-		}
-	},
-	"PageHeader":{
-		"Height":1.2
-	},
-	"PageFooter":{
-		"Height":0
-	},
-	"ReportHeader":[
-		{
-			"Name":"ReportHeader1",
-			"Height":7.01146,
-			"Control":[
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox1",
-					"Left":0.396875,
-					"Top":0.396875,
-					"Width":1.61396,
-					"Height":0.608542,
-					"Text":"规格型号："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox1",
-					"Left":2.19604,
-					"Top":0.396875,
-					"Width":2.59292,
-					"Height":0.396875,
-					"DataField":"PartNo"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox2",
-					"Left":0.185208,
-					"Top":4.07458,
-					"Width":1.19063,
-					"Height":0.608542,
-					"Text":"批次："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox2",
-					"Left":1.5875,
-					"Top":4.07458,
-					"Width":1.79917,
-					"Height":0.396875,
-					"DataField":"BatchNo"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox3",
-					"Left":0.396875,
-					"Top":1.00542,
-					"Width":4.81542,
-					"Height":0.582083,
-					"DataField":"PartName"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox3",
-					"Left":0.396875,
-					"Top":1.79917,
-					"Width":1.19063,
-					"Height":0.608542,
-					"Text":"车型："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox4",
-					"Left":1.79917,
-					"Top":1.79917,
-					"Width":2.98979,
-					"Height":0.608542,
-					"DataField":"PartType"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox4",
-					"Left":0.211667,
-					"Top":2.59292,
-					"Width":1.5875,
-					"Height":0.820208,
-					"Text":"有效期："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox5",
-					"Left":1.79917,
-					"Top":2.80458,
-					"Width":2.98979,
-					"Height":0.396875,
-					"DataField":"Validity"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox6",
-					"Left":0.211667,
-					"Top":3.41313,
-					"Width":5.00063,
-					"Height":0.396875,
-					"DataField":"ValidityDate"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox5",
-					"Left":0.132292,
-					"Top":5.87375,
-					"Width":1.19063,
-					"Height":0.608542,
-					"Text":"颜色："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox7",
-					"Left":1.53458,
-					"Top":5.87375,
-					"Width":2.19604,
-					"Height":0.608542,
-					"DataField":"Color"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox8",
-					"Left":0.185208,
-					"Top":4.86833,
-					"Width":2.59292,
-					"Height":0.608542,
-					"DataField":"ColorNo"
-				},
-				{
-					"Type":"FreeGrid",
-					"Name":"FreeGrid1",
-					"Left":5.00063,
-					"Top":0.396875,
-					"Border":{
-						"Styles":"[DrawLeft|DrawTop|DrawRight|DrawBottom]"
-					},
-					"ColumnCount":2,
-					"FreeGridColumn":[
-						{
-							"index":1,
-							"Width":1.905
-						},
-						{
-							"index":2,
-							"Width":0.79375
-						}
-					],
-					"FreeGridRow":[
-						{
-							"index":1,
-							"Height":0.608542
-						},
-						{
-							"index":2,
-							"Height":0.926042
-						},
-						{
-							"index":3,
-							"Height":1.05833
-						},
-						{
-							"index":4,
-							"Height":0.899583
-						},
-						{
-							"index":5,
-							"Height":0.820208
-						}
-					],
-					"FreeGridCell":[
-						{
-							"row":1,
-							"col":1,
-							"ColSpan":2
-						},
-						{
-							"row":2,
-							"col":1,
-							"Text":"半成品准备"
-						},
-						{
-							"row":3,
-							"col":1,
-							"Text":"内外板合装"
-						},
-						{
-							"row":4,
-							"col":1,
-							"Text":"设备操作"
-						},
-						{
-							"row":5,
-							"col":1,
-							"Text":"检验"
-						}
-					]
-				}
-			]
-		}
-	]
-}
\ No newline at end of file
diff --git a/PurchingMistakeNew/Report/X247后部扰流板装箱单.grf b/PurchingMistakeNew/Report/X247后部扰流板装箱单.grf
deleted file mode 100644
index 2641f80..0000000
--- a/PurchingMistakeNew/Report/X247后部扰流板装箱单.grf
+++ /dev/null
@@ -1,184 +0,0 @@
-{
-	"Version":"6.6.2.0",
-	"Font":{
-		"Name":"宋体",
-		"Size":105000,
-		"Weight":400,
-		"Charset":134
-	},
-	"Printer":{
-		"Size":256,
-		"Width":7,
-		"Height":8,
-		"Oriention":"Landscape",
-		"LeftMargin":0,
-		"TopMargin":0,
-		"RightMargin":0,
-		"BottomMargin":0
-	},
-	"DetailGrid":{
-		"Recordset":{
-			"ConnectionString":"Provider=SQLOLEDB.1;Password=a1+;Persist Security Info=True;User ID=sa;Initial Catalog=BBMPT;Data Source=10.60.101.9;Use Procedure for Prepare=1;Auto Translate=True;Packet Size=4096;Workstation ID=AMW-PC;Use Encryption for Data=False;Tag with column collation when possible=False",
-			"QuerySQL":"SELECT * FROM [dbo].[tb_Box_247] WHERE PartNo='A2477900588' AND [PrintTime] IS NULL  ORDER BY [CreateTime]",
-			"Field":[
-				{
-					"Name":"ID"
-				},
-				{
-					"Name":"BoxNo"
-				},
-				{
-					"Name":"PartNo"
-				},
-				{
-					"Name":"PartName"
-				},
-				{
-					"Name":"BatchNo"
-				},
-				{
-					"Name":"BoxCount",
-					"Type":"Float"
-				},
-				{
-					"Name":"CreateTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"PrintTime",
-					"Type":"DateTime"
-				}
-			]
-		},
-		"ColumnContent":{
-			"Height":0
-		},
-		"ColumnTitle":{
-			"Height":0
-		}
-	},
-	"PageHeader":{
-		"Height":1.2
-	},
-	"PageFooter":{
-		"Height":0
-	},
-	"ReportHeader":[
-		{
-			"Name":"ReportHeader1",
-			"Height":5.21229,
-			"Control":[
-				{
-					"Type":"FreeGrid",
-					"Name":"FreeGrid1",
-					"Left":0.608542,
-					"Top":0.211667,
-					"Border":{
-						"Styles":"[DrawLeft|DrawTop|DrawRight|DrawBottom]"
-					},
-					"ColumnCount":4,
-					"FreeGridColumn":[
-						{
-							"index":1,
-							"Width":1.71979
-						},
-						{
-							"index":2,
-							"Width":2.30188
-						},
-						{
-							"index":4,
-							"Width":0
-						}
-					],
-					"FreeGridRow":[
-						{
-							"index":1,
-							"Height":0.926042
-						},
-						{
-							"index":2,
-							"Height":1.05833
-						},
-						{
-							"index":3,
-							"Height":1.05833
-						},
-						{
-							"index":4,
-							"Height":0.978958
-						},
-						{
-							"index":5,
-							"Height":0.926042
-						}
-					],
-					"FreeGridCell":[
-						{
-							"row":1,
-							"col":1,
-							"Text":"包装单号"
-						},
-						{
-							"row":1,
-							"col":2,
-							"Text":"[#BoxNo#]",
-							"ColSpan":3
-						},
-						{
-							"row":2,
-							"col":1,
-							"Text":"物料描述"
-						},
-						{
-							"row":2,
-							"col":2,
-							"Text":"[#PartName#]",
-							"ColSpan":3
-						},
-						{
-							"row":3,
-							"col":1,
-							"Text":"物料号"
-						},
-						{
-							"row":3,
-							"col":2,
-							"Text":"[#PartNo#]"
-						},
-						{
-							"row":3,
-							"col":3,
-							"FreeCell":true,
-							"Control":[
-								{
-									"Type":"Barcode",
-									"Name":"Barcode1",
-									"Left":0.211667,
-									"Width":2.19604,
-									"Height":2.59292,
-									"BarcodeType":"QRCode",
-									"CaptionPosition":"None",
-									"Text":"[#BoxNo#]",
-									"QRCodeErrorLevel":3
-								}
-							],
-							"ColSpan":2,
-							"RowSpan":3
-						},
-						{
-							"row":4,
-							"col":1,
-							"Text":"批次"
-						},
-						{
-							"row":4,
-							"col":2,
-							"Text":"[#BatchNo#]"
-						}
-					]
-				}
-			]
-		}
-	]
-}
\ No newline at end of file
diff --git a/PurchingMistakeNew/Report/X247左侧前门板1.grf b/PurchingMistakeNew/Report/X247左侧前门板1.grf
deleted file mode 100644
index 5a2cef4..0000000
--- a/PurchingMistakeNew/Report/X247左侧前门板1.grf
+++ /dev/null
@@ -1,225 +0,0 @@
-{
-	"Version":"6.6.2.0",
-	"Font":{
-		"Name":"宋体",
-		"Size":105000,
-		"Weight":400,
-		"Charset":134
-	},
-	"Printer":{
-		"Size":256,
-		"Width":6,
-		"Height":6,
-		"LeftMargin":0,
-		"TopMargin":0,
-		"RightMargin":0,
-		"BottomMargin":0
-	},
-	"DetailGrid":{
-		"Recordset":{
-			"ConnectionString":"Provider=SQLOLEDB.1;Password=a1+;Persist Security Info=True;User ID=sa;Initial Catalog=BBMPT;Data Source=10.60.101.9;Use Procedure for Prepare=1;Auto Translate=True;Packet Size=4096;Workstation ID=AMW-PC;Use Encryption for Data=False;Tag with column collation when possible=False",
-			"QuerySQL":"SELECT * FROM [dbo].[tb_Assembly_247] WHERE substring(PartNo,1,11) in ('A2477203007','A2477203207','A2477205006' )AND PrintTime IS NULL ORDER BY CreateTime",
-			"Field":[
-				{
-					"Name":"ID"
-				},
-				{
-					"Name":"PartNo"
-				},
-				{
-					"Name":"PartName"
-				},
-				{
-					"Name":"BatchNo"
-				},
-				{
-					"Name":"Color"
-				},
-				{
-					"Name":"ColorNo"
-				},
-				{
-					"Name":"PartType"
-				},
-				{
-					"Name":"Validity"
-				},
-				{
-					"Name":"ValidityDate"
-				},
-				{
-					"Name":"CreateTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"PrintTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"TapeBatchNo"
-				},
-				{
-					"Name":"Des"
-				}
-			]
-		},
-		"ColumnContent":{
-			"Height":0
-		},
-		"ColumnTitle":{
-			"Height":0
-		}
-	},
-	"PageFooter":{
-		"Height":0
-	},
-	"ReportHeader":[
-		{
-			"Name":"ReportHeader1",
-			"Height":5.79438,
-			"Control":[
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox1",
-					"Left":0.396875,
-					"Width":1.61396,
-					"Height":0.608542,
-					"Text":"规格型号："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox1",
-					"Left":0.211667,
-					"Top":0.608542,
-					"Width":5.97958,
-					"Height":0.396875,
-					"Font":{
-						"Name":"宋体",
-						"Size":120000,
-						"Weight":400,
-						"Charset":134
-					},
-					"DataField":"PartNo"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox2",
-					"Top":3.59833,
-					"Width":1.19063,
-					"Height":0.608542,
-					"Text":"批次："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox2",
-					"Left":1.40229,
-					"Top":3.59833,
-					"Width":1.79917,
-					"Height":0.396875,
-					"DataField":"BatchNo"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox3",
-					"Left":0.211667,
-					"Top":1.00542,
-					"Width":5.97958,
-					"Height":0.396875,
-					"DataField":"PartName"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox3",
-					"Left":0.0264583,
-					"Top":1.79917,
-					"Width":1.19063,
-					"Height":0.608542,
-					"Text":"车型："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox4",
-					"Left":1.42875,
-					"Top":1.79917,
-					"Width":4.20688,
-					"Height":0.608542,
-					"DataField":"PartType"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox4",
-					"Left":0.0264583,
-					"Top":2.40771,
-					"Width":2.16958,
-					"Height":0.79375,
-					"Text":"胶带有效期："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox5",
-					"Left":2.80458,
-					"Top":2.59292,
-					"Width":2.98979,
-					"Height":0.396875,
-					"DataField":"Validity"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox6",
-					"Left":0.0264583,
-					"Top":3.20146,
-					"Width":5.00063,
-					"Height":0.396875,
-					"DataField":"ValidityDate"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox5",
-					"Left":-0.0529167,
-					"Top":4.78896,
-					"Width":0.899583,
-					"Height":0.608542,
-					"Text":"颜色："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox7",
-					"Left":1.21708,
-					"Top":4.78896,
-					"Width":2.19604,
-					"Height":0.608542,
-					"DataField":"Color"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox8",
-					"Left":0.0264583,
-					"Top":4.20688,
-					"Width":2.59292,
-					"Height":0.582083,
-					"DataField":"ColorNo"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox9",
-					"Left":0.0264583,
-					"Top":1.40229,
-					"Width":5.60917,
-					"Height":0.396875,
-					"DataField":"Des"
-				},
-				{
-					"Type":"Barcode",
-					"Name":"Barcode1",
-					"Left":3.04271,
-					"Top":3.59833,
-					"Width":2.38125,
-					"Height":2.01083,
-					"BarcodeType":"QRCode",
-					"CaptionPosition":"None",
-					"Text":"[#PartNo#]"
-				}
-			]
-		}
-	]
-}
\ No newline at end of file
diff --git a/PurchingMistakeNew/Report/X247左侧前门板装箱单.grf b/PurchingMistakeNew/Report/X247左侧前门板装箱单.grf
deleted file mode 100644
index 4b7dbb0..0000000
--- a/PurchingMistakeNew/Report/X247左侧前门板装箱单.grf
+++ /dev/null
@@ -1,241 +0,0 @@
-{
-	"Version":"6.6.2.0",
-	"Font":{
-		"Name":"宋体",
-		"Size":105000,
-		"Weight":400,
-		"Charset":134
-	},
-	"Printer":{
-		"Size":256,
-		"Width":7,
-		"Height":6,
-		"LeftMargin":0,
-		"TopMargin":0,
-		"RightMargin":0,
-		"BottomMargin":0
-	},
-	"DetailGrid":{
-		"Recordset":{
-			"ConnectionString":"Provider=SQLOLEDB.1;Password=a1+;Persist Security Info=True;User ID=sa;Initial Catalog=BBMPT;Data Source=10.60.101.9;Use Procedure for Prepare=1;Auto Translate=True;Packet Size=4096;Workstation ID=AMW-PC;Use Encryption for Data=False;Tag with column collation when possible=False",
-			"QuerySQL":"SELECT * FROM [dbo].[tb_Box_247] WHERE PartNo in('A2477204606','A2477204806','A2477205006') AND [PrintTime] IS NULL  ORDER BY [CreateTime]",
-			"Field":[
-				{
-					"Name":"ID"
-				},
-				{
-					"Name":"BoxNo"
-				},
-				{
-					"Name":"PartNo"
-				},
-				{
-					"Name":"PartName"
-				},
-				{
-					"Name":"BatchNo"
-				},
-				{
-					"Name":"BoxCount",
-					"Type":"Float"
-				},
-				{
-					"Name":"CreateTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"PrintTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"Des"
-				}
-			]
-		},
-		"ColumnContent":{
-			"Height":0
-		},
-		"ColumnTitle":{
-			"Height":0
-		}
-	},
-	"PageFooter":{
-		"Height":0
-	},
-	"ReportHeader":[
-		{
-			"Name":"ReportHeader1",
-			"Height":5.21229,
-			"Control":[
-				{
-					"Type":"FreeGrid",
-					"Name":"FreeGrid1",
-					"Left":0.291042,
-					"Top":0.238125,
-					"Border":{
-						"Styles":"[DrawLeft|DrawTop|DrawRight|DrawBottom]"
-					},
-					"ColumnCount":4,
-					"RowCount":6,
-					"FreeGridColumn":[
-						{
-							"index":1,
-							"Width":1.71979
-						},
-						{
-							"index":2,
-							"Width":2.30188
-						},
-						{
-							"index":3,
-							"Width":2.2
-						},
-						{
-							"index":4,
-							"Width":0
-						}
-					],
-					"FreeGridRow":[
-						{
-							"index":1,
-							"Height":0.661458
-						},
-						{
-							"index":2,
-							"Height":0.555625
-						},
-						{
-							"index":4,
-							"Height":1.05833
-						},
-						{
-							"index":5,
-							"Height":0.978958
-						},
-						{
-							"index":6,
-							"Height":0.767292
-						}
-					],
-					"FreeGridCell":[
-						{
-							"row":1,
-							"col":1,
-							"Text":"包装单号"
-						},
-						{
-							"row":1,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#BoxNo#]",
-							"ColSpan":3
-						},
-						{
-							"row":2,
-							"col":1,
-							"Text":"物料描述",
-							"RowSpan":2
-						},
-						{
-							"row":2,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#PartName#]",
-							"ColSpan":3
-						},
-						{
-							"row":3,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#Des#]",
-							"ColSpan":2
-						},
-						{
-							"row":4,
-							"col":1,
-							"Text":"物料号"
-						},
-						{
-							"row":4,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#PartNo#]"
-						},
-						{
-							"row":4,
-							"col":3,
-							"FreeCell":true,
-							"Control":[
-								{
-									"Type":"Barcode",
-									"Name":"Barcode1",
-									"Top":0.211667,
-									"Width":2.01083,
-									"Height":2.19604,
-									"BarcodeType":"QRCode",
-									"CaptionPosition":"None",
-									"Text":"[#BoxNo#]",
-									"QRCodeErrorLevel":3
-								}
-							],
-							"ColSpan":2,
-							"RowSpan":3
-						},
-						{
-							"row":5,
-							"col":1,
-							"Text":"批次"
-						},
-						{
-							"row":5,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#BatchNo#]"
-						},
-						{
-							"row":6,
-							"col":1,
-							"Text":"包装数量"
-						},
-						{
-							"row":6,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#BoxCount#]"
-						}
-					]
-				}
-			]
-		}
-	]
-}
\ No newline at end of file
diff --git a/PurchingMistakeNew/Report/X247左侧后门板1.grf b/PurchingMistakeNew/Report/X247左侧后门板1.grf
deleted file mode 100644
index aa1c9e4..0000000
--- a/PurchingMistakeNew/Report/X247左侧后门板1.grf
+++ /dev/null
@@ -1,225 +0,0 @@
-{
-	"Version":"6.6.2.0",
-	"Font":{
-		"Name":"宋体",
-		"Size":105000,
-		"Weight":400,
-		"Charset":134
-	},
-	"Printer":{
-		"Size":256,
-		"Width":6,
-		"Height":7,
-		"LeftMargin":0,
-		"TopMargin":0,
-		"RightMargin":0,
-		"BottomMargin":0
-	},
-	"DetailGrid":{
-		"Recordset":{
-			"ConnectionString":"Provider=SQLOLEDB.1;Password=a1+;Persist Security Info=True;User ID=sa;Initial Catalog=BBMPT;Data Source=10.60.101.9;Use Procedure for Prepare=1;Auto Translate=True;Packet Size=4096;Workstation ID=AMW-PC;Use Encryption for Data=False;Tag with column collation when possible=False",
-			"QuerySQL":"SELECT * FROM [dbo].[tb_Assembly_247] WHERE substring(PartNo,1,11 ) in('A2477305303','A2477305503','A2477305703') AND PrintTime IS NULL ORDER BY CreateTime",
-			"Field":[
-				{
-					"Name":"ID"
-				},
-				{
-					"Name":"PartNo"
-				},
-				{
-					"Name":"PartName"
-				},
-				{
-					"Name":"BatchNo"
-				},
-				{
-					"Name":"Color"
-				},
-				{
-					"Name":"ColorNo"
-				},
-				{
-					"Name":"PartType"
-				},
-				{
-					"Name":"Validity"
-				},
-				{
-					"Name":"ValidityDate"
-				},
-				{
-					"Name":"CreateTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"PrintTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"TapeBatchNo"
-				},
-				{
-					"Name":"Des"
-				}
-			]
-		},
-		"ColumnContent":{
-			"Height":0
-		},
-		"ColumnTitle":{
-			"Height":0
-		}
-	},
-	"PageFooter":{
-		"Height":0
-	},
-	"ReportHeader":[
-		{
-			"Name":"ReportHeader1",
-			"Height":5.79438,
-			"Control":[
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox1",
-					"Top":0.185208,
-					"Width":1.5875,
-					"Height":0.608542,
-					"Text":"规格型号："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox1",
-					"Left":0.211667,
-					"Top":0.79375,
-					"Width":5.58271,
-					"Height":0.396875,
-					"Font":{
-						"Name":"宋体",
-						"Size":120000,
-						"Weight":400,
-						"Charset":134
-					},
-					"DataField":"PartNo"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox2",
-					"Top":3.70417,
-					"Width":1.19063,
-					"Height":0.608542,
-					"Text":"批次："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox2",
-					"Left":1.40229,
-					"Top":3.70417,
-					"Width":1.79917,
-					"Height":0.396875,
-					"DataField":"BatchNo"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox3",
-					"Left":0.211667,
-					"Top":1.19063,
-					"Width":5.97958,
-					"Height":0.582083,
-					"DataField":"PartName"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox3",
-					"Left":0.0264583,
-					"Top":2.19604,
-					"Width":1.19063,
-					"Height":0.608542,
-					"Text":"车型："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox4",
-					"Left":1.40229,
-					"Top":2.19604,
-					"Width":4.20688,
-					"Height":0.608542,
-					"DataField":"PartType"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox4",
-					"Left":0.0264583,
-					"Top":2.51354,
-					"Width":2.38125,
-					"Height":0.79375,
-					"Text":"胶带有效期："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox5",
-					"Left":2.40771,
-					"Top":2.69875,
-					"Width":2.98979,
-					"Height":0.396875,
-					"DataField":"Validity"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox6",
-					"Left":0.0264583,
-					"Top":3.41313,
-					"Width":5.00063,
-					"Height":0.396875,
-					"DataField":"ValidityDate"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox5",
-					"Left":-0.0529167,
-					"Top":4.89479,
-					"Width":0.820208,
-					"Height":0.608542,
-					"Text":"颜色："
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox7",
-					"Left":1.21708,
-					"Top":4.89479,
-					"Width":2.19604,
-					"Height":0.608542,
-					"DataField":"Color"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox8",
-					"Left":0.0264583,
-					"Top":4.31271,
-					"Width":2.59292,
-					"Height":0.582083,
-					"DataField":"ColorNo"
-				},
-				{
-					"Type":"FieldBox",
-					"Name":"FieldBox9",
-					"Left":0.211667,
-					"Top":1.5875,
-					"Width":5.58271,
-					"Height":0.502708,
-					"DataField":"Des"
-				},
-				{
-					"Type":"Barcode",
-					"Name":"Barcode1",
-					"Left":3.04271,
-					"Top":3.70417,
-					"Width":2.38125,
-					"Height":2.01083,
-					"BarcodeType":"QRCode",
-					"CaptionPosition":"None",
-					"Text":"[#PartNo#]"
-				}
-			]
-		}
-	]
-}
\ No newline at end of file
diff --git a/PurchingMistakeNew/Report/X247左侧后门板装箱单.grf b/PurchingMistakeNew/Report/X247左侧后门板装箱单.grf
deleted file mode 100644
index 96734c5..0000000
--- a/PurchingMistakeNew/Report/X247左侧后门板装箱单.grf
+++ /dev/null
@@ -1,241 +0,0 @@
-{
-	"Version":"6.6.2.0",
-	"Font":{
-		"Name":"宋体",
-		"Size":105000,
-		"Weight":400,
-		"Charset":134
-	},
-	"Printer":{
-		"Size":256,
-		"Width":7,
-		"Height":6,
-		"LeftMargin":0,
-		"TopMargin":0,
-		"RightMargin":0,
-		"BottomMargin":0
-	},
-	"DetailGrid":{
-		"Recordset":{
-			"ConnectionString":"Provider=SQLOLEDB.1;Password=a1+;Persist Security Info=True;User ID=sa;Initial Catalog=BBMPT;Data Source=10.60.101.9;Use Procedure for Prepare=1;Auto Translate=True;Packet Size=4096;Workstation ID=AMW-PC;Use Encryption for Data=False;Tag with column collation when possible=False",
-			"QuerySQL":"SELECT * FROM [dbo].[tb_Box_247] WHERE PartNo in('A2477305303','A2477305503','A2477305703') AND [PrintTime] IS NULL  ORDER BY [CreateTime]",
-			"Field":[
-				{
-					"Name":"ID"
-				},
-				{
-					"Name":"BoxNo"
-				},
-				{
-					"Name":"PartNo"
-				},
-				{
-					"Name":"PartName"
-				},
-				{
-					"Name":"BatchNo"
-				},
-				{
-					"Name":"BoxCount",
-					"Type":"Float"
-				},
-				{
-					"Name":"CreateTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"PrintTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"Des"
-				}
-			]
-		},
-		"ColumnContent":{
-			"Height":0
-		},
-		"ColumnTitle":{
-			"Height":0
-		}
-	},
-	"PageFooter":{
-		"Height":0
-	},
-	"ReportHeader":[
-		{
-			"Name":"ReportHeader1",
-			"Height":5.21229,
-			"Control":[
-				{
-					"Type":"FreeGrid",
-					"Name":"FreeGrid1",
-					"Left":0.291042,
-					"Top":0.238125,
-					"Border":{
-						"Styles":"[DrawLeft|DrawTop|DrawRight|DrawBottom]"
-					},
-					"ColumnCount":4,
-					"RowCount":6,
-					"FreeGridColumn":[
-						{
-							"index":1,
-							"Width":1.71979
-						},
-						{
-							"index":2,
-							"Width":2.30188
-						},
-						{
-							"index":3,
-							"Width":2.2
-						},
-						{
-							"index":4,
-							"Width":0
-						}
-					],
-					"FreeGridRow":[
-						{
-							"index":1,
-							"Height":0.714375
-						},
-						{
-							"index":2,
-							"Height":0.661458
-						},
-						{
-							"index":4,
-							"Height":1.05833
-						},
-						{
-							"index":5,
-							"Height":0.978958
-						},
-						{
-							"index":6,
-							"Height":0.767292
-						}
-					],
-					"FreeGridCell":[
-						{
-							"row":1,
-							"col":1,
-							"Text":"包装单号"
-						},
-						{
-							"row":1,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#BoxNo#]",
-							"ColSpan":3
-						},
-						{
-							"row":2,
-							"col":1,
-							"Text":"物料描述",
-							"RowSpan":2
-						},
-						{
-							"row":2,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#PartName#]",
-							"ColSpan":3
-						},
-						{
-							"row":3,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#Des#]",
-							"ColSpan":2
-						},
-						{
-							"row":4,
-							"col":1,
-							"Text":"物料号"
-						},
-						{
-							"row":4,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#PartNo#]"
-						},
-						{
-							"row":4,
-							"col":3,
-							"FreeCell":true,
-							"Control":[
-								{
-									"Type":"Barcode",
-									"Name":"Barcode1",
-									"Top":0.211667,
-									"Width":2.01083,
-									"Height":2.19604,
-									"BarcodeType":"QRCode",
-									"CaptionPosition":"None",
-									"Text":"[#BoxNo#]",
-									"QRCodeErrorLevel":3
-								}
-							],
-							"ColSpan":2,
-							"RowSpan":3
-						},
-						{
-							"row":5,
-							"col":1,
-							"Text":"批次"
-						},
-						{
-							"row":5,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#BatchNo#]"
-						},
-						{
-							"row":6,
-							"col":1,
-							"Text":"包装数量"
-						},
-						{
-							"row":6,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#BoxCount#]"
-						}
-					]
-				}
-			]
-		}
-	]
-}
\ No newline at end of file
diff --git a/PurchingMistakeNew/Report/X247装箱单.grf b/PurchingMistakeNew/Report/X247装箱单.grf
deleted file mode 100644
index efd26be..0000000
--- a/PurchingMistakeNew/Report/X247装箱单.grf
+++ /dev/null
@@ -1,254 +0,0 @@
-{
-	"Version":"6.6.2.0",
-	"Font":{
-		"Name":"宋体",
-		"Size":105000,
-		"Weight":400,
-		"Charset":134
-	},
-	"Printer":{
-		"Size":256,
-		"Width":7,
-		"Height":6,
-		"LeftMargin":0,
-		"TopMargin":0,
-		"RightMargin":0,
-		"BottomMargin":0
-	},
-	"DetailGrid":{
-		"Recordset":{
-			"ConnectionString":"Provider=SQLOLEDB.1;Password=a1+;Persist Security Info=True;User ID=sa;Initial Catalog=BBMPT;Data Source=10.60.101.9;Use Procedure for Prepare=1;Auto Translate=True;Packet Size=4096;Workstation ID=AMW-PC;Use Encryption for Data=False;Tag with column collation when possible=False",
-			"QuerySQL":"SELECT * FROM [dbo].[tb_Box_247] WHERE PartNo in('A2477204706','A2477204906','A2477205106') AND [PrintTime] IS NULL  ORDER BY [CreateTime]",
-			"Field":[
-				{
-					"Name":"ID"
-				},
-				{
-					"Name":"BoxNo"
-				},
-				{
-					"Name":"PartNo"
-				},
-				{
-					"Name":"PartName"
-				},
-				{
-					"Name":"BatchNo"
-				},
-				{
-					"Name":"BoxCount",
-					"Type":"Float"
-				},
-				{
-					"Name":"CreateTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"PrintTime",
-					"Type":"DateTime"
-				},
-				{
-					"Name":"Des"
-				}
-			]
-		},
-		"ColumnContent":{
-			"Height":0
-		},
-		"ColumnTitle":{
-			"Height":0
-		}
-	},
-	"PageFooter":{
-		"Height":0
-	},
-	"Parameter":[
-		{
-			"Name":"BoxNo"
-		},
-		{
-			"Name":"PartName"
-		},
-		{
-			"Name":"Des"
-		},
-		{
-			"Name":"PartNo"
-		},
-		{
-			"Name":"BatchNo"
-		},
-		{
-			"Name":"QLevel"
-		},
-		{
-			"Name":"Parameter7"
-		}
-	],
-	"ReportHeader":[
-		{
-			"Name":"ReportHeader1",
-			"Height":5.21229,
-			"Control":[
-				{
-					"Type":"FreeGrid",
-					"Name":"FreeGrid1",
-					"Left":0.291042,
-					"Top":0.238125,
-					"Border":{
-						"Styles":"[DrawLeft|DrawTop|DrawRight|DrawBottom]"
-					},
-					"ColumnCount":4,
-					"RowCount":6,
-					"FreeGridColumn":[
-						{
-							"index":1,
-							"Width":1.71979
-						},
-						{
-							"index":2,
-							"Width":2.30188
-						},
-						{
-							"index":3,
-							"Width":2.2
-						},
-						{
-							"index":4,
-							"Width":0
-						}
-					],
-					"FreeGridRow":[
-						{
-							"index":1,
-							"Height":0.79375
-						},
-						{
-							"index":4,
-							"Height":1.05833
-						},
-						{
-							"index":5,
-							"Height":0.978958
-						},
-						{
-							"index":6,
-							"Height":0.767292
-						}
-					],
-					"FreeGridCell":[
-						{
-							"row":1,
-							"col":1,
-							"Text":"包装单号"
-						},
-						{
-							"row":1,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#{BoxNo}#]",
-							"ColSpan":3
-						},
-						{
-							"row":2,
-							"col":1,
-							"Text":"物料描述",
-							"RowSpan":2
-						},
-						{
-							"row":2,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#{PartName}#]",
-							"ColSpan":3
-						},
-						{
-							"row":3,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#{Des}#]",
-							"ColSpan":2
-						},
-						{
-							"row":4,
-							"col":1,
-							"Text":"物料号"
-						},
-						{
-							"row":4,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#{PartNo}#]"
-						},
-						{
-							"row":4,
-							"col":3,
-							"FreeCell":true,
-							"Control":[
-								{
-									"Type":"Barcode",
-									"Name":"Barcode1",
-									"Top":0.211667,
-									"Width":2.01083,
-									"Height":2.19604,
-									"BarcodeType":"QRCode",
-									"CaptionPosition":"None",
-									"Text":"[#{BoxNo}#]",
-									"QRCodeErrorLevel":3
-								}
-							],
-							"ColSpan":2,
-							"RowSpan":3
-						},
-						{
-							"row":5,
-							"col":1,
-							"Text":"批次"
-						},
-						{
-							"row":5,
-							"col":2,
-							"Font":{
-								"Name":"宋体",
-								"Size":75000,
-								"Weight":400,
-								"Charset":134
-							},
-							"Text":"[#{BatchNo}#]"
-						},
-						{
-							"row":6,
-							"col":1,
-							"Text":"Q等级"
-						},
-						{
-							"row":6,
-							"col":2,
-							"Text":"[#{QLevel}#]"
-						}
-					]
-				}
-			]
-		}
-	]
-}
\ No newline at end of file
diff --git a/PurchingMistakeNew/Report/X247门板.grf b/PurchingMistakeNew/Report/X247门板.grf
deleted file mode 100644
index e7296eb..0000000
--- a/PurchingMistakeNew/Report/X247门板.grf
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-	"Version":"6.6.2.0",
-	"Font":{
-		"Name":"宋体",
-		"Size":105000,
-		"Weight":400,
-		"Charset":134
-	},
-	"Printer":{
-		"Size":256,
-		"Width":6,
-		"Height":6,
-		"LeftMargin":0,
-		"TopMargin":0,
-		"RightMargin":0,
-		"BottomMargin":0
-	},
-	"Parameter":[
-		{
-			"Name":"ID"
-		},
-		{
-			"Name":"PartNo"
-		},
-		{
-			"Name":"PartName"
-		},
-		{
-			"Name":"BatchNo"
-		},
-		{
-			"Name":"Color"
-		},
-		{
-			"Name":"ColorNo"
-		},
-		{
-			"Name":"PartType"
-		},
-		{
-			"Name":"Validity"
-		},
-		{
-			"Name":"ValidityDate"
-		},
-		{
-			"Name":"CreateTime"
-		},
-		{
-			"Name":"PrintTime"
-		},
-		{
-			"Name":"TapeBatchNo"
-		},
-		{
-			"Name":"Des"
-		},
-		{
-			"Name":"QLevel"
-		}
-	],
-	"ReportHeader":[
-		{
-			"Name":"ReportHeader1",
-			"Height":5.79,
-			"Control":[
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox1",
-					"Left":0.211667,
-					"Width":1.5875,
-					"Height":0.396875,
-					"Text":"规格型号"
-				},
-				{
-					"Type":"MemoBox",
-					"Name":"MemoBox1",
-					"Left":0.211667,
-					"Top":0.396875,
-					"Width":5.79438,
-					"Height":0.396875,
-					"Text":"[#{PartNo}#]"
-				},
-				{
-					"Type":"MemoBox",
-					"Name":"MemoBox2",
-					"Left":0.211667,
-					"Top":0.79375,
-					"Width":5.79438,
-					"Height":0.396875,
-					"Text":"[#{PartName}#]"
-				},
-				{
-					"Type":"MemoBox",
-					"Name":"MemoBox3",
-					"Left":0.211667,
-					"Top":1.19063,
-					"Width":5.79438,
-					"Height":0.396875,
-					"Text":"[#{Des}#]"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox2",
-					"Left":0.211667,
-					"Top":1.5875,
-					"Width":0.978958,
-					"Height":0.423333,
-					"Text":"车型:"
-				},
-				{
-					"Type":"MemoBox",
-					"Name":"MemoBox4",
-					"Left":1.19063,
-					"Top":1.5875,
-					"Width":4.81542,
-					"Height":0.423333,
-					"Text":"[#{PartType}#]"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox3",
-					"Left":0.211667,
-					"Top":2.01083,
-					"Width":2.19604,
-					"Height":0.396875,
-					"Text":"胶带有效期:"
-				},
-				{
-					"Type":"MemoBox",
-					"Name":"MemoBox5",
-					"Left":2.40771,
-					"Top":2.01083,
-					"Width":3.59833,
-					"Height":0.396875,
-					"Text":"[#{Validity}#]"
-				},
-				{
-					"Type":"MemoBox",
-					"Name":"MemoBox6",
-					"Left":0.211667,
-					"Top":2.54,
-					"Width":5.79438,
-					"Height":0.396875,
-					"Text":"[#{ValidityDate}#]"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox4",
-					"Left":0.211667,
-					"Top":2.98979,
-					"Width":1.19063,
-					"Height":0.396875,
-					"Text":"批次:"
-				},
-				{
-					"Type":"MemoBox",
-					"Name":"MemoBox7",
-					"Left":1.40229,
-					"Top":2.98979,
-					"Width":2.19604,
-					"Height":0.396875,
-					"Text":"[#{BatchNo}#]"
-				},
-				{
-					"Type":"Barcode",
-					"Name":"Barcode1",
-					"Left":3.59833,
-					"Top":2.98979,
-					"Width":2.19604,
-					"Height":2.2225,
-					"BarcodeType":"QRCode",
-					"CaptionPosition":"None",
-					"Text":"[#{PartNo}#]"
-				},
-				{
-					"Type":"MemoBox",
-					"Name":"MemoBox8",
-					"Left":0.211667,
-					"Top":3.59833,
-					"Width":3.20146,
-					"Height":0.396875,
-					"Text":"[#{ColorNo}#]"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox5",
-					"Left":0.211667,
-					"Top":4.15396,
-					"Width":1.19063,
-					"Height":0.396875,
-					"Text":"颜色:"
-				},
-				{
-					"Type":"MemoBox",
-					"Name":"MemoBox9",
-					"Left":1.40229,
-					"Top":4.15396,
-					"Width":2.01083,
-					"Height":0.396875,
-					"Text":"[#{Color}#]"
-				},
-				{
-					"Type":"StaticBox",
-					"Name":"StaticBox6",
-					"Left":0.211667,
-					"Top":4.73604,
-					"Width":1.19063,
-					"Height":0.396875,
-					"Text":"Q等级"
-				},
-				{
-					"Type":"MemoBox",
-					"Name":"MemoBox10",
-					"Left":1.40229,
-					"Top":4.73604,
-					"Width":2.01083,
-					"Height":0.396875,
-					"Text":"[#{QLevel}#]"
-				}
-			]
-		}
-	]
-}
\ No newline at end of file
diff --git a/PurchingMistakeNew/ReportHelper.cs b/PurchingMistakeNew/ReportHelper.cs
index edfb450..48f1151 100644
--- a/PurchingMistakeNew/ReportHelper.cs
+++ b/PurchingMistakeNew/ReportHelper.cs
@@ -96,6 +96,79 @@ namespace PurchingMistakeNew
             return ofd.FileName;
         }
 
+        #region 新标签模板
+        /// <summary>
+        /// X247门板标签
+        /// </summary>
+        /// <returns></returns>
+        internal static string GetTemplateDoor()
+        {
+            return Application.StartupPath + $@"\Report\标签-247门板.grf";
+        }
+        /// <summary>
+        /// X243轮眉标签
+        /// </summary>
+        /// <returns></returns>
+        internal static string GetTemplateWheelBrow243()
+        {
+            return Application.StartupPath + $@"\Report\标签-243轮眉.grf";
+        }
+        /// <summary>
+        /// X247轮眉标签
+        /// </summary>
+        /// <returns></returns>
+        internal static string GetTemplateWheelBrow247()
+        {
+            return Application.StartupPath + $@"\Report\标签-247轮眉.grf";
+        }
+        /// <summary>
+        /// X247&H247扰流板标签
+        /// </summary>
+        /// <returns></returns>
+        internal static string GetTemplateSpoiler()
+        {
+            return Application.StartupPath + $@"\Report\标签-247扰流板.grf";
+        }
+        #endregion
+
+        #region 新装箱单模板
+        /// <summary>
+        /// 247门板装箱单
+        /// </summary>
+        /// <param name="fileName"></param>
+        /// <returns></returns>
+        internal static string GetBoxTemplateNameDoor()
+        {
+            return Application.StartupPath + $@"\Report\装箱单-门板.grf";
+        }
+        /// <summary>
+        /// 247轮眉装箱单
+        /// </summary>
+        /// <returns></returns>
+        internal static string GetBoxTemplateNameWheelBrow247()
+        {
+            return Application.StartupPath + $@"\Report\装箱单-247轮眉.grf";
+        }
+        /// <summary>
+        /// 243轮眉装箱单
+        /// </summary>
+        /// <returns></returns>
+        internal static string GetBoxTemplateNameWheelBrow243()
+        {
+            return Application.StartupPath + $@"\Report\装箱单-243轮眉.grf";
+        }
+        /// <summary>
+        /// X247和H247扰流板装箱单
+        /// </summary>
+        /// <returns></returns>
+        internal static string GetBoxTemplateNameSpoiler()
+        {
+            return Application.StartupPath + $@"\Report\装箱单-247扰流板.grf";
+        }
+        #endregion
+
+
+
         internal static string GetTemplateName(string fileName)
         {
             return Application.StartupPath + $@"\Report\{fileName}.grf";
@@ -108,5 +181,7 @@ namespace PurchingMistakeNew
         {
             return $@"D:\{fileName}.grf";
         }
+
+      
     }
 }
diff --git a/WebService/WMSWebService.asmx.cs b/WebService/WMSWebService.asmx.cs
index e68fd3f..e070b6d 100644
--- a/WebService/WMSWebService.asmx.cs
+++ b/WebService/WMSWebService.asmx.cs
@@ -388,6 +388,7 @@ namespace Webservice
         }
 
         [WebMethod]
+        [ScriptMethod(UseHttpGet = true, ResponseFormat = ResponseFormat.Json)]
         public void WMSSprayingForAppReturnNo(string barcode)
         {
             string errorReason = "";