diff --git a/APP/QMAPP.Web/App_Data/Menu.xml b/APP/QMAPP.Web/App_Data/Menu.xml
index 1226a1d..4e7acb3 100644
--- a/APP/QMAPP.Web/App_Data/Menu.xml
+++ b/APP/QMAPP.Web/App_Data/Menu.xml
@@ -298,7 +298,7 @@
     </Actions>
   </MenuItem>-->
   <!--TJDoorPlankPlanPrint   DoorPlankPlan-->
-  <MenuItem MenuID="02030000" SystemID="FJC" MenuDes="TJ门板计划管理"   Action="/TJDoorPlankPlanPrint/List?ORDER_TYPE=DOORPLANK" Target="url" PowerID="CD02030000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="02000000" Seq="1">
+  <!--<MenuItem MenuID="02030000" SystemID="FJC" MenuDes="TJ门板计划管理"   Action="/TJDoorPlankPlanPrint/List?ORDER_TYPE=DOORPLANK" Target="url" PowerID="CD02030000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="02000000" Seq="1">
     <Actions>
       <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="List" PowerID="CD02030001">查询</Action>
       <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="Add" PowerID="CD02030002">添加</Action>
@@ -312,8 +312,8 @@
       <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="ExportExcel" PowerID="CD02030009">导出</Action>
       <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="TemplateExcel" PowerID="CD02030010">下载模板</Action>
     </Actions>
-  </MenuItem>
-  <!--<MenuItem MenuID="02030000" SystemID="FJC" MenuDes="门板计划管理"   Action="/DoorPlankPlan/List?ORDER_TYPE=DOORPLANK" Target="url" PowerID="CD02030000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="02000000" Seq="1">
+  </MenuItem>-->
+  <MenuItem MenuID="02030000" SystemID="FJC" MenuDes="门板计划管理"   Action="/DoorPlankPlan/List?ORDER_TYPE=DOORPLANK" Target="url" PowerID="CD02030000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="02000000" Seq="1">
     <Actions>
       <Action ContorllerName="DoorPlankPlan" ActionName="List" PowerID="CD02030001">查询</Action>
       <Action ContorllerName="DoorPlankPlan" ActionName="Add" PowerID="CD02030002">添加</Action>
@@ -327,7 +327,7 @@
       <Action ContorllerName="DoorPlankPlan" ActionName="ExportExcel" PowerID="CD02030009">导出</Action>
       <Action ContorllerName="DoorPlankPlan" ActionName="TemplateExcel" PowerID="CD02030010">下载模板</Action>
     </Actions>
-  </MenuItem>-->
+  </MenuItem>
   
   <MenuItem MenuID="02040000" SystemID="FJC" MenuDes="仪表板计划管理"   Action="/DashBoardPlan/List?ORDER_TYPE=DASHBOARD" Target="url" PowerID="CD02040000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="02000000" Seq="1">
     <Actions>
diff --git a/APP/QMAPP.Web/Web.config b/APP/QMAPP.Web/Web.config
index 18a3b45..4bd4d32 100644
--- a/APP/QMAPP.Web/Web.config
+++ b/APP/QMAPP.Web/Web.config
@@ -50,11 +50,15 @@
     <add name="maindb" connectionString="Data Source=10.122.213.104;Initial Catalog=ADIENT_VW276_MES;User Id=MES;Password=Password1;" providerName="System.Data.SqlClient"/>
 
     <add name="maindb" connectionString="Data Source=119.3.213.202,13315;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=ChangkeTec@2020;" providerName="System.Data.SqlClient"/>
-    -->
+   
 
     <add name="maindb" connectionString="Data Source=10.111.144.99;Initial Catalog=ADIENT_CD_MES_20230930;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
     <add name="maindbBZD" connectionString="Data Source=10.111.144.99;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
 
+ -->
+    <add name="maindb" connectionString="Data Source=10.111.144.111;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password01;" providerName="System.Data.SqlClient"/>
+    <add name="maindbBZD" connectionString="Data Source=10.111.144.111;Initial Catalog=BZD;User Id=sa;Password=Password01;" providerName="System.Data.SqlClient"/>
+
 
     <!--<add name="maindb" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>
     <add name="maindbBZD" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=BZD;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>-->
diff --git a/APPMD/QMAPP.MD.DAL/ProcessRouteDAL.cs b/APPMD/QMAPP.MD.DAL/ProcessRouteDAL.cs
index 79bfe72..ea4bdd6 100644
--- a/APPMD/QMAPP.MD.DAL/ProcessRouteDAL.cs
+++ b/APPMD/QMAPP.MD.DAL/ProcessRouteDAL.cs
@@ -882,7 +882,7 @@ namespace QMAPP.MD.DAL
                 sql.AppendLine("  FROM [T_MD_PROCESS_ROUTE_WORKCELL] AS RW ");
                 sql.AppendLine("  LEFT JOIN [T_MD_PROCESS_ROUTE] AS R ");
                 sql.AppendLine("	ON RW.[ROUTE_CODE]=R.[ROUTE_CODE] ");
-                sql.AppendLine(" WHERE [WORKCELL_CODE]=@workcellcode ");
+                sql.AppendLine(" WHERE [WORKCELL_CODE]=@workcellcode and RW.FLGDEL = '0'");
 
                 parameters.Add(new DataParameter("workcellcode", workcellcode));
 
diff --git a/APPMD/QMAPP.MD.Web/Web.config b/APPMD/QMAPP.MD.Web/Web.config
index 089fa18..14c31eb 100644
--- a/APPMD/QMAPP.MD.Web/Web.config
+++ b/APPMD/QMAPP.MD.Web/Web.config
@@ -37,10 +37,14 @@
     <!--<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>-->
 
     <!--<add name="maindb" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>
-    <add name="maindbBZD" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=BZD;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>-->
+    <add name="maindbBZD" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=BZD;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>
 
     <add name="maindb" connectionString="Data Source=10.111.144.99;Initial Catalog=ADIENT_CD_MES_20230930;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
     <add name="maindbBZD" connectionString="Data Source=10.111.144.99;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
+-->
+
+    <add name="maindb" connectionString="Data Source=10.111.144.111;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password01;" providerName="System.Data.SqlClient"/>
+    <add name="maindbBZD" connectionString="Data Source=10.111.144.111;Initial Catalog=BZD;User Id=sa;Password=Password01;" providerName="System.Data.SqlClient"/>
 
 
     <!-- <add name="maindb" connectionString="Data Source=123.56.115.74;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=qwe123$%^;" providerName="System.Data.SqlClient" />
diff --git a/APPQ5/QMAPP.FJC.BLL/Basic/AppConfigBLL.cs b/APPQ5/QMAPP.FJC.BLL/Basic/AppConfigBLL.cs
index b1220e5..4f237cf 100644
--- a/APPQ5/QMAPP.FJC.BLL/Basic/AppConfigBLL.cs
+++ b/APPQ5/QMAPP.FJC.BLL/Basic/AppConfigBLL.cs
@@ -41,6 +41,24 @@ namespace QMAPP.FJC.BLL.Basic
                 throw ex;
             }
         }
+        /// <summary>
+        /// 获取信息
+        /// </summary>
+        /// <param name="">条件</param>
+        /// <returns>信息</returns>
+        public DataResult<int> UpdateAppConfig(string pConfigCode, string pConfigValue)
+        {
+            try
+            {
+                DataResult<int> result = new DataResult<int>();
+                result.Result = new AppConfigDAL().UpdateAppConfig(pConfigCode, pConfigValue);
+                return result;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
 
         /// <summary>
         /// 获取信息
diff --git a/APPQ5/QMAPP.FJC.BLL/Operation/MainOperationBLL.cs b/APPQ5/QMAPP.FJC.BLL/Operation/MainOperationBLL.cs
index 05e9d28..dcf4920 100644
--- a/APPQ5/QMAPP.FJC.BLL/Operation/MainOperationBLL.cs
+++ b/APPQ5/QMAPP.FJC.BLL/Operation/MainOperationBLL.cs
@@ -2804,6 +2804,40 @@ namespace QMAPP.FJC.BLL.Operation
             return result;
         }
 
+        /// <summary>
+        /// 成都蒙皮条码打印
+        /// </summary>
+        /// <param name="product"></param>
+        /// <returns></returns>
+        public DataResult<List<PrintCode>> GetPrintCodeForMP4(Material item)
+        {
+            DataResult<List<PrintCode>> result = new DataResult<List<PrintCode>>();
+            List<PrintCode> printCodeList = new List<PrintCode>();
+            PrintCodeDAL dal = new PrintCodeDAL();
+            PrintCode proCodeInfo = new PrintCode();
+            proCodeInfo.PRODUCTCODE = item.MATERIAL_CODE;
+            //获取PrinCode信息
+            proCodeInfo = new PrintCodeDAL().GetPrintCodeInfo(proCodeInfo);
+            if (proCodeInfo != null)
+            {
+                if (proCodeInfo.UPDATETIME.ToShortDateString() != DateTime.Now.ToShortDateString())
+                {
+                    proCodeInfo.SERIAL_NUM = 0;
+                    dal.UpdateBySql(proCodeInfo);
+                }
+
+                string time = DateTime.Now.ToString("yyMMddHHmm");
+                proCodeInfo.SERIAL_NUM = proCodeInfo.SERIAL_NUM + 1;
+                string serialnumber = (proCodeInfo.SERIAL_NUM).ToString().PadLeft(4, '0');
+                proCodeInfo.MAINCODE = proCodeInfo.PRECODE + time + serialnumber;
+                dal.Update(proCodeInfo);
+                printCodeList.Add(proCodeInfo);
+            }
+            result.Result = printCodeList;
+            return result;
+        }
+
+
         /// <summary>
         /// 成都注塑条码打印带注塑参数
         /// </summary>
diff --git a/APPQ5/QMAPP.FJC.BLL/Operation/ProductBLL.cs b/APPQ5/QMAPP.FJC.BLL/Operation/ProductBLL.cs
index deeb524..ba35f59 100644
--- a/APPQ5/QMAPP.FJC.BLL/Operation/ProductBLL.cs
+++ b/APPQ5/QMAPP.FJC.BLL/Operation/ProductBLL.cs
@@ -58,6 +58,29 @@ namespace QMAPP.FJC.BLL.Operation
             }
         }
 
+        /// <summary>
+        /// 获取信息
+        /// </summary>
+        /// <param name="">条件</param>
+        /// <returns>信息</returns>
+        public List<Product> GetListpro(Product model)
+        {
+            try
+            {
+                return new ProductDAL().GetListpro(model);
+            }
+            catch (Exception ex)
+            {
+                LogManager.LogHelper.Error(new LogInfo()
+                {
+                    ErrorInfo = ex,
+                    Tag = ex.StackTrace,
+                    Info = "零件条码--获取零件信息"
+                });
+                throw ex;
+            }
+        }
+
         /// <summary>
         /// 获取信息
         /// </summary>
diff --git a/APPQ5/QMAPP.FJC.DAL/Basic/AppConfigDAL.cs b/APPQ5/QMAPP.FJC.DAL/Basic/AppConfigDAL.cs
index f753455..7f7a3b4 100644
--- a/APPQ5/QMAPP.FJC.DAL/Basic/AppConfigDAL.cs
+++ b/APPQ5/QMAPP.FJC.DAL/Basic/AppConfigDAL.cs
@@ -38,6 +38,22 @@ namespace QMAPP.FJC.DAL.Basic
                 throw ex;
             }
         }
+        public int UpdateAppConfig(string pConfigValue,string pConfigCode)
+        {
+            try
+            {
+                string sqlScript = $" update T_MD_AppConfig_QD set Value='{pConfigValue}' where Code='{pConfigCode}'";
+                List<DataParameter> parameters = new List<DataParameter>();
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    return session.ExecuteSql(sqlScript, parameters.ToArray());
+                }
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
 
         public AppConfig GetPID(AppConfig Code)
         {
diff --git a/APPQ5/QMAPP.FJC.DAL/MD/MaterialDAL.cs b/APPQ5/QMAPP.FJC.DAL/MD/MaterialDAL.cs
index 9489d25..9bb4097 100644
--- a/APPQ5/QMAPP.FJC.DAL/MD/MaterialDAL.cs
+++ b/APPQ5/QMAPP.FJC.DAL/MD/MaterialDAL.cs
@@ -82,7 +82,7 @@ namespace QMAPP.FJC.DAL.MD
                 parameters.Add(new DataParameter("materialcode", materialcode));
                 if (materialcode.Length >= 13)
                 {
-                    sql = $"SELECT * FROM [T_MD_MATERIAL] WHERE REPLACE(REPLACE(REPLACE([MATERIAL_CODE],'.',''),' ',''),'-','')=@materialcode or REPLACE(REPLACE(REPLACE([MATERIAL_CODE],'.',''),' ',''),'-','')='{materialcode.Substring(0,13)}'";
+                    sql = $"SELECT * FROM [T_MD_MATERIAL] WHERE REPLACE(REPLACE(REPLACE([MATERIAL_CODE],'.',''),' ',''),'-','')=@materialcode or REPLACE(REPLACE(REPLACE([MATERIAL_CODE],'.',''),' ',''),'-','')='17G867{materialcode.Substring(0,7)}'";
                 }
                 using (IDataSession session = AppDataFactory.CreateMainSession())
                 {
diff --git a/APPQ5/QMAPP.FJC.DAL/Operation/ProductDAL.cs b/APPQ5/QMAPP.FJC.DAL/Operation/ProductDAL.cs
index a7cc2e0..b55e623 100644
--- a/APPQ5/QMAPP.FJC.DAL/Operation/ProductDAL.cs
+++ b/APPQ5/QMAPP.FJC.DAL/Operation/ProductDAL.cs
@@ -87,6 +87,65 @@ namespace QMAPP.FJC.DAL.Operation
             }
         }
 
+        /// <summary>
+        /// 获取信息
+        /// </summary>
+        /// <param name="">条件</param>
+        /// <returns>*信息</returns>
+        public List<Product> GetListpro(Product model)
+        {
+            try
+            {
+                var List = new List<Product>();
+                if (this.BaseSession != null)
+                {
+                    model = BaseSession.Get<Product>(model);
+                }
+                else
+                {
+                    string sql = null;
+                    List<DataParameter> parameters = new List<DataParameter>();
+                    try
+                    {
+                        sql = "SELECT * FROM T_AW_PRODUCT WHERE 1=1 ";
+                        if (string.IsNullOrEmpty(model.PID) == false)
+                        {
+                            sql += " AND PID = @PID";
+                            parameters.Add(new DataParameter("PID", model.PID));
+                        }
+                        if (string.IsNullOrEmpty(model.PRODUCTCODE) == false)
+                        {
+                            sql += " AND PRODUCTCODE = @PRODUCTCODE";
+                            parameters.Add(new DataParameter("PRODUCTCODE", model.PRODUCTCODE));
+                        }
+
+                        if (string.IsNullOrEmpty(model.MATERIAL_CODE) == false)
+                        {
+                            sql += " AND MATERIAL_CODE = @MATERIAL_CODE";
+                            parameters.Add(new DataParameter("MATERIAL_CODE", model.MATERIAL_CODE));
+                        }
+                        using (IDataSession session = AppDataFactory.CreateMainSession())
+                        {
+                            string sqlChange = this.ChangeSqlByDB(sql, session);
+                            //获取信息
+                            List = session.GetList<Product>(sqlChange, parameters.ToArray()).ToList();
+                        }
+                        return List;
+                    }
+                    catch (Exception ex)
+                    {
+                        RecordExceptionLog(ex, "物料号信息数据层-获取信息");
+                        throw ex;
+                    }
+                }
+                return List;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
         /// <summary>
         /// 获取T_AW_PACKAGE信息
         /// </summary>
diff --git a/APPQ5/QMAPP.FJC.Web/App_Data/Menu.xml b/APPQ5/QMAPP.FJC.Web/App_Data/Menu.xml
index 07dbf1e..af5e0d4 100644
--- a/APPQ5/QMAPP.FJC.Web/App_Data/Menu.xml
+++ b/APPQ5/QMAPP.FJC.Web/App_Data/Menu.xml
@@ -298,7 +298,7 @@
     </Actions>
   </MenuItem>-->
   <!--TJDoorPlankPlanPrint   DoorPlankPlan-->
-  <MenuItem MenuID="02030000" SystemID="FJC" MenuDes="门板计划管理"   Action="/TJDoorPlankPlanPrint/List?ORDER_TYPE=DOORPLANK" Target="url" PowerID="CD02030000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="02000000" Seq="1">
+  <MenuItem MenuID="02030000" SystemID="FJC" MenuDes="门板计划管理"   Action="/DoorPlankPlan/List?ORDER_TYPE=DOORPLANK" Target="url" PowerID="CD02030000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="02000000" Seq="1">
     <Actions>
       <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="List" PowerID="CD02030001">查询</Action>
       <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="Add" PowerID="CD02030002">添加</Action>
diff --git a/APPQ5/QMAPP.FJC.Web/Web.config b/APPQ5/QMAPP.FJC.Web/Web.config
index f924281..5687118 100644
--- a/APPQ5/QMAPP.FJC.Web/Web.config
+++ b/APPQ5/QMAPP.FJC.Web/Web.config
@@ -56,9 +56,12 @@
     
     <add name="maindb" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>
     <add name="maindbBZD" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=BZD;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>
-      -->
+    
     <add name="maindb" connectionString="Data Source=10.111.144.99;Initial Catalog=ADIENT_CD_MES_20230930;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
     <add name="maindbBZD" connectionString="Data Source=10.111.144.99;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
+  -->
+    <add name="maindb" connectionString="Data Source=10.111.144.111;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password01;" providerName="System.Data.SqlClient"/>
+    <add name="maindbBZD" connectionString="Data Source=10.111.144.111;Initial Catalog=BZD;User Id=sa;Password=Password01;" providerName="System.Data.SqlClient"/>
 
 
     <!--<add name="maindb" connectionString="Data Source=.;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Microsoft2008;" providerName="System.Data.SqlClient"/>
diff --git a/APPQ5/QMAPP.WinForm/App.config b/APPQ5/QMAPP.WinForm/App.config
index 90aafd7..3c6c0dd 100644
--- a/APPQ5/QMAPP.WinForm/App.config
+++ b/APPQ5/QMAPP.WinForm/App.config
@@ -3,21 +3,22 @@
   <connectionStrings>
     <!--主数据库连接-->
     <!--
-    <add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
-    <add name="maindbBZD" connectionString="Data Source=10.111.144.98;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
+    <add name="maindb" connectionString="Data Source=10.111.144.111;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password01;" providerName="System.Data.SqlClient"/>
+    <add name="maindbBZD" connectionString="Data Source=10.111.144.111;Initial Catalog=BZD;User Id=sa;Password=Password01;" providerName="System.Data.SqlClient"/>
 
-    
-   
-
-    
+  
     <add name="maindb" connectionString="Data Source=10.111.144.99;Initial Catalog=ADIENT_CD_MES_20230930;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
     <add name="maindbBZD" connectionString="Data Source=10.111.144.99;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
-   -->
+   
 
-    <add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>
+<add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>
+ 
+  -->
+ <add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
+ <add name="maindbBZD" connectionString="Data Source=10.111.144.98;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
 
 
-    <!--
+ <!--
 
     <add name="maindb" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>
     <add name="maindbBZD" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=BZD;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>
@@ -58,7 +59,9 @@
     <add key="并线装配基础信息" value="4A-AE0001;VW331 IP 装配夹具;IP_ASSEMBLY;BORAIPASSY"/>-->
     <!--装配排序 end-->
 
-
+    <!--喷胶验证混胶时间工位-->
+    <add key="喷胶验证混胶时间工位" value="GLUE_SPRAY_BC316MP4" />
+    <add key="混胶时间"  value="4" />
 
 
     <!---->
@@ -233,12 +236,19 @@
 
       <endpoint address="http://localhost:8938/GeneralService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="CenterGeneralService.IGeneralService" name="BasicHttpBinding_IGeneralService" />
       <endpoint address="http://localhost:8938/LoginService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="LoginService.ILoginService" name="BasicHttpBinding_ILoginService" />
-      <endpoint address="net.tcp://10.111.144.94:4444/OpcService" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IOpcService" contract="ServiceOpc.IOpcService" name="NetTcpBinding_IOpcService" />
+
+      <endpoint address="net.tcp://127.0.0.1:4444/OpcService" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IOpcService" contract="ServiceOpc.IOpcService" name="NetTcpBinding_IOpcService" />
+      
+      <!--<endpoint address="net.tcp://10.111.144.94:4444/OpcService" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IOpcService" contract="ServiceOpc.IOpcService" name="NetTcpBinding_IOpcService" />-->
 
        <!--<endpoint address="http://10.111.144.97:8938/GeneralService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="CenterGeneralService.IGeneralService" name="BasicHttpBinding_IGeneralService" />
       <endpoint address="http://10.111.144.97:8938/LoginService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="LoginService.ILoginService" name="BasicHttpBinding_ILoginService" />
       <endpoint address="net.tcp://127.0.0.1:4444/OpcService" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IOpcService" contract="ServiceOpc.IOpcService" name="NetTcpBinding_IOpcService" />-->
 
+      <!--<endpoint address="http://10.117.133.80:8939/GeneralService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="CenterGeneralService.IGeneralService" name="BasicHttpBinding_IGeneralService" />
+      <endpoint address="http://10.117.133.80:8939/LoginService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="LoginService.ILoginService" name="BasicHttpBinding_ILoginService" />
+      <endpoint address="net.tcp://127.0.0.1:4444/OpcService" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IOpcService" contract="ServiceOpc.IOpcService" name="NetTcpBinding_IOpcService" />-->
+
 
       <!--<endpoint address="http://10.122.213.105:8938/GeneralService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="CenterGeneralService.IGeneralService" name="BasicHttpBinding_IGeneralService" />
       <endpoint address="http://10.122.213.105:8938/LoginService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="LoginService.ILoginService" name="BasicHttpBinding_ILoginService" />
diff --git a/APPQ5/QMAPP.WinForm/Forms/Injection/SewingPrint.Designer.cs b/APPQ5/QMAPP.WinForm/Forms/Injection/SewingPrint.Designer.cs
new file mode 100644
index 0000000..b78beb4
--- /dev/null
+++ b/APPQ5/QMAPP.WinForm/Forms/Injection/SewingPrint.Designer.cs
@@ -0,0 +1,550 @@
+namespace QMAPP.WinForm.Forms.Injection
+{
+    partial class SewingPrint
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+            this.DGView = new System.Windows.Forms.DataGridView();
+            this.MAINCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.MATERIAL_NAME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.PRODUCTCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.CREATETIME = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.tsbPrint = new System.Windows.Forms.Button();
+            this.textMaterialName = new System.Windows.Forms.TextBox();
+            this.txtMaterialCode = new System.Windows.Forms.TextBox();
+            this.label6 = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.plPrintSetting = new System.Windows.Forms.Panel();
+            this.textBox1 = new System.Windows.Forms.TextBox();
+            this.cbMould = new System.Windows.Forms.ComboBox();
+            this.label9 = new System.Windows.Forms.Label();
+            this.tpPrintMode = new System.Windows.Forms.TabControl();
+            this.tpManual = new System.Windows.Forms.TabPage();
+            this.cbTemplateDesign = new System.Windows.Forms.CheckBox();
+            this.tpTimer = new System.Windows.Forms.TabPage();
+            this.label5 = new System.Windows.Forms.Label();
+            this.cbPrintSpan = new System.Windows.Forms.ComboBox();
+            this.cbPrintCount = new System.Windows.Forms.ComboBox();
+            this.btnStart = new System.Windows.Forms.Button();
+            this.btnStop = new System.Windows.Forms.Button();
+            this.lblLastCount = new System.Windows.Forms.Label();
+            this.label7 = new System.Windows.Forms.Label();
+            this.label8 = new System.Windows.Forms.Label();
+            this.timer2 = new System.Windows.Forms.Timer(this.components);
+            this.tabControl1 = new System.Windows.Forms.TabControl();
+            this.tabPage1 = new System.Windows.Forms.TabPage();
+            ((System.ComponentModel.ISupportInitialize)(this.DGView)).BeginInit();
+            this.groupBox1.SuspendLayout();
+            this.plPrintSetting.SuspendLayout();
+            this.tpPrintMode.SuspendLayout();
+            this.tpManual.SuspendLayout();
+            this.tpTimer.SuspendLayout();
+            this.tabControl1.SuspendLayout();
+            this.tabPage1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // DGView
+            // 
+            this.DGView.AllowUserToAddRows = false;
+            this.DGView.AllowUserToDeleteRows = false;
+            this.DGView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
+            this.DGView.BackgroundColor = System.Drawing.SystemColors.ButtonFace;
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.DGView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
+            this.DGView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.DGView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.MAINCODE,
+            this.MATERIAL_NAME,
+            this.PRODUCTCODE,
+            this.CREATETIME});
+            this.DGView.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.DGView.Location = new System.Drawing.Point(4, 4);
+            this.DGView.Margin = new System.Windows.Forms.Padding(4);
+            this.DGView.Name = "DGView";
+            this.DGView.ReadOnly = true;
+            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle12.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.DGView.RowHeadersDefaultCellStyle = dataGridViewCellStyle12;
+            this.DGView.RowTemplate.Height = 23;
+            this.DGView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+            this.DGView.Size = new System.Drawing.Size(1006, 858);
+            this.DGView.TabIndex = 38;
+            // 
+            // MAINCODE
+            // 
+            this.MAINCODE.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.MAINCODE.DataPropertyName = "MAINCODE";
+            dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 15.75F);
+            this.MAINCODE.DefaultCellStyle = dataGridViewCellStyle8;
+            this.MAINCODE.FillWeight = 48.95314F;
+            this.MAINCODE.HeaderText = "条码信息";
+            this.MAINCODE.Name = "MAINCODE";
+            this.MAINCODE.ReadOnly = true;
+            this.MAINCODE.Width = 280;
+            // 
+            // MATERIAL_NAME
+            // 
+            this.MATERIAL_NAME.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.MATERIAL_NAME.DataPropertyName = "MATERIAL_NAME";
+            dataGridViewCellStyle9.Font = new System.Drawing.Font("宋体", 15.75F);
+            this.MATERIAL_NAME.DefaultCellStyle = dataGridViewCellStyle9;
+            this.MATERIAL_NAME.FillWeight = 99.90437F;
+            this.MATERIAL_NAME.HeaderText = "零件名称";
+            this.MATERIAL_NAME.Name = "MATERIAL_NAME";
+            this.MATERIAL_NAME.ReadOnly = true;
+            this.MATERIAL_NAME.Width = 260;
+            // 
+            // PRODUCTCODE
+            // 
+            this.PRODUCTCODE.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.PRODUCTCODE.DataPropertyName = "PRODUCTCODE";
+            dataGridViewCellStyle10.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.PRODUCTCODE.DefaultCellStyle = dataGridViewCellStyle10;
+            this.PRODUCTCODE.FillWeight = 48.95314F;
+            this.PRODUCTCODE.HeaderText = "零件号";
+            this.PRODUCTCODE.Name = "PRODUCTCODE";
+            this.PRODUCTCODE.ReadOnly = true;
+            this.PRODUCTCODE.Width = 200;
+            // 
+            // CREATETIME
+            // 
+            this.CREATETIME.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.CREATETIME.DataPropertyName = "CREATETIME";
+            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle11.Font = new System.Drawing.Font("宋体", 15.75F);
+            dataGridViewCellStyle11.Format = "f";
+            dataGridViewCellStyle11.NullValue = null;
+            this.CREATETIME.DefaultCellStyle = dataGridViewCellStyle11;
+            this.CREATETIME.FillWeight = 48.95314F;
+            this.CREATETIME.HeaderText = "操作时间";
+            this.CREATETIME.Name = "CREATETIME";
+            this.CREATETIME.ReadOnly = true;
+            this.CREATETIME.Width = 250;
+            // 
+            // tsbPrint
+            // 
+            this.tsbPrint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.tsbPrint.Font = new System.Drawing.Font("微软雅黑", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tsbPrint.Image = global::QMAPP.WinForm.Resource1.save;
+            this.tsbPrint.Location = new System.Drawing.Point(362, 9);
+            this.tsbPrint.Margin = new System.Windows.Forms.Padding(4);
+            this.tsbPrint.Name = "tsbPrint";
+            this.tsbPrint.Size = new System.Drawing.Size(285, 124);
+            this.tsbPrint.TabIndex = 34;
+            this.tsbPrint.Text = "打印";
+            this.tsbPrint.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.tsbPrint.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
+            this.tsbPrint.UseVisualStyleBackColor = true;
+            this.tsbPrint.Click += new System.EventHandler(this.tsbPrint_Click);
+            // 
+            // textMaterialName
+            // 
+            this.textMaterialName.BackColor = System.Drawing.SystemColors.Control;
+            this.textMaterialName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.textMaterialName.Location = new System.Drawing.Point(105, 165);
+            this.textMaterialName.Margin = new System.Windows.Forms.Padding(4);
+            this.textMaterialName.MaxLength = 3096;
+            this.textMaterialName.Name = "textMaterialName";
+            this.textMaterialName.ReadOnly = true;
+            this.textMaterialName.Size = new System.Drawing.Size(553, 39);
+            this.textMaterialName.TabIndex = 33;
+            // 
+            // txtMaterialCode
+            // 
+            this.txtMaterialCode.BackColor = System.Drawing.SystemColors.Control;
+            this.txtMaterialCode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtMaterialCode.Location = new System.Drawing.Point(105, 223);
+            this.txtMaterialCode.Margin = new System.Windows.Forms.Padding(4);
+            this.txtMaterialCode.MaxLength = 3096;
+            this.txtMaterialCode.Name = "txtMaterialCode";
+            this.txtMaterialCode.ReadOnly = true;
+            this.txtMaterialCode.Size = new System.Drawing.Size(553, 39);
+            this.txtMaterialCode.TabIndex = 30;
+            this.txtMaterialCode.TextChanged += new System.EventHandler(this.txtMaterialCode_TextChanged);
+            // 
+            // label6
+            // 
+            this.label6.AutoSize = true;
+            this.label6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label6.Location = new System.Drawing.Point(4, 227);
+            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(93, 31);
+            this.label6.TabIndex = 29;
+            this.label6.Text = "零件号:";
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.Location = new System.Drawing.Point(4, 169);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(93, 31);
+            this.label1.TabIndex = 25;
+            this.label1.Text = "零件名:";
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.plPrintSetting);
+            this.groupBox1.Controls.Add(this.tpPrintMode);
+            this.groupBox1.Dock = System.Windows.Forms.DockStyle.Right;
+            this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.groupBox1.Location = new System.Drawing.Point(1028, 6);
+            this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Padding = new System.Windows.Forms.Padding(4);
+            this.groupBox1.Size = new System.Drawing.Size(676, 910);
+            this.groupBox1.TabIndex = 40;
+            this.groupBox1.TabStop = false;
+            // 
+            // plPrintSetting
+            // 
+            this.plPrintSetting.Controls.Add(this.textBox1);
+            this.plPrintSetting.Controls.Add(this.cbMould);
+            this.plPrintSetting.Controls.Add(this.label6);
+            this.plPrintSetting.Controls.Add(this.label1);
+            this.plPrintSetting.Controls.Add(this.label9);
+            this.plPrintSetting.Controls.Add(this.txtMaterialCode);
+            this.plPrintSetting.Controls.Add(this.textMaterialName);
+            this.plPrintSetting.Dock = System.Windows.Forms.DockStyle.Top;
+            this.plPrintSetting.Location = new System.Drawing.Point(4, 36);
+            this.plPrintSetting.Margin = new System.Windows.Forms.Padding(0);
+            this.plPrintSetting.Name = "plPrintSetting";
+            this.plPrintSetting.Size = new System.Drawing.Size(668, 606);
+            this.plPrintSetting.TabIndex = 64;
+            // 
+            // textBox1
+            // 
+            this.textBox1.Location = new System.Drawing.Point(128, 22);
+            this.textBox1.Name = "textBox1";
+            this.textBox1.Size = new System.Drawing.Size(341, 39);
+            this.textBox1.TabIndex = 61;
+            this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtCode_KeyDown);
+            // 
+            // cbMould
+            // 
+            this.cbMould.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cbMould.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cbMould.FormattingEnabled = true;
+            this.cbMould.Location = new System.Drawing.Point(128, 87);
+            this.cbMould.Margin = new System.Windows.Forms.Padding(4);
+            this.cbMould.Name = "cbMould";
+            this.cbMould.Size = new System.Drawing.Size(530, 39);
+            this.cbMould.TabIndex = 60;
+            this.cbMould.SelectedIndexChanged += new System.EventHandler(this.cbMould_SelectedIndexChanged);
+            // 
+            // label9
+            // 
+            this.label9.AutoSize = true;
+            this.label9.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label9.Location = new System.Drawing.Point(3, 22);
+            this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label9.Name = "label9";
+            this.label9.Size = new System.Drawing.Size(117, 31);
+            this.label9.TabIndex = 25;
+            this.label9.Text = "缝纫配置:";
+            // 
+            // tpPrintMode
+            // 
+            this.tpPrintMode.Controls.Add(this.tpManual);
+            this.tpPrintMode.Controls.Add(this.tpTimer);
+            this.tpPrintMode.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.tpPrintMode.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tpPrintMode.Location = new System.Drawing.Point(4, 687);
+            this.tpPrintMode.Margin = new System.Windows.Forms.Padding(4);
+            this.tpPrintMode.Name = "tpPrintMode";
+            this.tpPrintMode.Padding = new System.Drawing.Point(12, 9);
+            this.tpPrintMode.SelectedIndex = 0;
+            this.tpPrintMode.Size = new System.Drawing.Size(668, 219);
+            this.tpPrintMode.TabIndex = 62;
+            // 
+            // tpManual
+            // 
+            this.tpManual.Controls.Add(this.cbTemplateDesign);
+            this.tpManual.Controls.Add(this.tsbPrint);
+            this.tpManual.Location = new System.Drawing.Point(4, 58);
+            this.tpManual.Margin = new System.Windows.Forms.Padding(4);
+            this.tpManual.Name = "tpManual";
+            this.tpManual.Padding = new System.Windows.Forms.Padding(4);
+            this.tpManual.Size = new System.Drawing.Size(660, 157);
+            this.tpManual.TabIndex = 2;
+            this.tpManual.Text = "手动打印";
+            this.tpManual.UseVisualStyleBackColor = true;
+            // 
+            // cbTemplateDesign
+            // 
+            this.cbTemplateDesign.AutoSize = true;
+            this.cbTemplateDesign.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cbTemplateDesign.Location = new System.Drawing.Point(9, 9);
+            this.cbTemplateDesign.Margin = new System.Windows.Forms.Padding(4);
+            this.cbTemplateDesign.Name = "cbTemplateDesign";
+            this.cbTemplateDesign.Size = new System.Drawing.Size(136, 35);
+            this.cbTemplateDesign.TabIndex = 35;
+            this.cbTemplateDesign.Text = "模板调整";
+            this.cbTemplateDesign.UseVisualStyleBackColor = true;
+            // 
+            // tpTimer
+            // 
+            this.tpTimer.Controls.Add(this.label5);
+            this.tpTimer.Controls.Add(this.cbPrintSpan);
+            this.tpTimer.Controls.Add(this.cbPrintCount);
+            this.tpTimer.Controls.Add(this.btnStart);
+            this.tpTimer.Controls.Add(this.btnStop);
+            this.tpTimer.Controls.Add(this.lblLastCount);
+            this.tpTimer.Controls.Add(this.label7);
+            this.tpTimer.Controls.Add(this.label8);
+            this.tpTimer.Location = new System.Drawing.Point(4, 58);
+            this.tpTimer.Margin = new System.Windows.Forms.Padding(4);
+            this.tpTimer.Name = "tpTimer";
+            this.tpTimer.Padding = new System.Windows.Forms.Padding(4);
+            this.tpTimer.Size = new System.Drawing.Size(660, 157);
+            this.tpTimer.TabIndex = 1;
+            this.tpTimer.Text = "定时打印";
+            this.tpTimer.UseVisualStyleBackColor = true;
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label5.Location = new System.Drawing.Point(12, 20);
+            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(129, 37);
+            this.label5.TabIndex = 56;
+            this.label5.Text = "定时打印";
+            // 
+            // cbPrintSpan
+            // 
+            this.cbPrintSpan.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cbPrintSpan.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cbPrintSpan.FormattingEnabled = true;
+            this.cbPrintSpan.Items.AddRange(new object[] {
+            "10s",
+            "15s",
+            "20s",
+            "30s",
+            "40s",
+            "50s",
+            "60s",
+            "70s",
+            "80s"});
+            this.cbPrintSpan.Location = new System.Drawing.Point(153, 15);
+            this.cbPrintSpan.Margin = new System.Windows.Forms.Padding(4);
+            this.cbPrintSpan.Name = "cbPrintSpan";
+            this.cbPrintSpan.Size = new System.Drawing.Size(157, 45);
+            this.cbPrintSpan.TabIndex = 53;
+            // 
+            // cbPrintCount
+            // 
+            this.cbPrintCount.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cbPrintCount.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.cbPrintCount.FormattingEnabled = true;
+            this.cbPrintCount.Items.AddRange(new object[] {
+            "20",
+            "50",
+            "100",
+            "150",
+            "200",
+            "300",
+            "400"});
+            this.cbPrintCount.Location = new System.Drawing.Point(153, 76);
+            this.cbPrintCount.Margin = new System.Windows.Forms.Padding(4);
+            this.cbPrintCount.Name = "cbPrintCount";
+            this.cbPrintCount.Size = new System.Drawing.Size(157, 45);
+            this.cbPrintCount.TabIndex = 54;
+            // 
+            // btnStart
+            // 
+            this.btnStart.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnStart.Location = new System.Drawing.Point(344, 14);
+            this.btnStart.Margin = new System.Windows.Forms.Padding(4);
+            this.btnStart.Name = "btnStart";
+            this.btnStart.Size = new System.Drawing.Size(135, 52);
+            this.btnStart.TabIndex = 55;
+            this.btnStart.Text = "开始";
+            this.btnStart.UseVisualStyleBackColor = true;
+            this.btnStart.Click += new System.EventHandler(this.btnStart_Click);
+            // 
+            // btnStop
+            // 
+            this.btnStop.Enabled = false;
+            this.btnStop.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnStop.Location = new System.Drawing.Point(495, 14);
+            this.btnStop.Margin = new System.Windows.Forms.Padding(4);
+            this.btnStop.Name = "btnStop";
+            this.btnStop.Size = new System.Drawing.Size(135, 52);
+            this.btnStop.TabIndex = 55;
+            this.btnStop.Text = "停止";
+            this.btnStop.UseVisualStyleBackColor = true;
+            this.btnStop.Click += new System.EventHandler(this.btnStop_Click);
+            // 
+            // lblLastCount
+            // 
+            this.lblLastCount.AutoSize = true;
+            this.lblLastCount.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblLastCount.Location = new System.Drawing.Point(498, 84);
+            this.lblLastCount.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblLastCount.Name = "lblLastCount";
+            this.lblLastCount.Size = new System.Drawing.Size(34, 37);
+            this.lblLastCount.TabIndex = 59;
+            this.lblLastCount.Text = "0";
+            // 
+            // label7
+            // 
+            this.label7.AutoSize = true;
+            this.label7.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label7.Location = new System.Drawing.Point(12, 81);
+            this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(129, 37);
+            this.label7.TabIndex = 57;
+            this.label7.Text = "打印数量";
+            // 
+            // label8
+            // 
+            this.label8.AutoSize = true;
+            this.label8.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label8.Location = new System.Drawing.Point(346, 84);
+            this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(129, 37);
+            this.label8.TabIndex = 58;
+            this.label8.Text = "剩余数量";
+            // 
+            // timer2
+            // 
+            this.timer2.Enabled = true;
+            this.timer2.Interval = 1000;
+            this.timer2.Tick += new System.EventHandler(this.timer2_Tick);
+            // 
+            // tabControl1
+            // 
+            this.tabControl1.Controls.Add(this.tabPage1);
+            this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabControl1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tabControl1.Location = new System.Drawing.Point(6, 6);
+            this.tabControl1.Margin = new System.Windows.Forms.Padding(15, 15, 15, 4);
+            this.tabControl1.Name = "tabControl1";
+            this.tabControl1.SelectedIndex = 0;
+            this.tabControl1.Size = new System.Drawing.Size(1022, 910);
+            this.tabControl1.TabIndex = 41;
+            // 
+            // tabPage1
+            // 
+            this.tabPage1.Controls.Add(this.DGView);
+            this.tabPage1.Location = new System.Drawing.Point(4, 40);
+            this.tabPage1.Margin = new System.Windows.Forms.Padding(4);
+            this.tabPage1.Name = "tabPage1";
+            this.tabPage1.Padding = new System.Windows.Forms.Padding(4);
+            this.tabPage1.Size = new System.Drawing.Size(1014, 866);
+            this.tabPage1.TabIndex = 0;
+            this.tabPage1.Text = "打印记录";
+            this.tabPage1.UseVisualStyleBackColor = true;
+            // 
+            // SewingPrint
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1710, 922);
+            this.Controls.Add(this.tabControl1);
+            this.Controls.Add(this.groupBox1);
+            this.Margin = new System.Windows.Forms.Padding(4);
+            this.Name = "SewingPrint";
+            this.Padding = new System.Windows.Forms.Padding(6);
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "注塑条码打印";
+            this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.InjectionCodePrint_FormClosed);
+            this.Load += new System.EventHandler(this.InjectionCodePrint_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.DGView)).EndInit();
+            this.groupBox1.ResumeLayout(false);
+            this.plPrintSetting.ResumeLayout(false);
+            this.plPrintSetting.PerformLayout();
+            this.tpPrintMode.ResumeLayout(false);
+            this.tpManual.ResumeLayout(false);
+            this.tpManual.PerformLayout();
+            this.tpTimer.ResumeLayout(false);
+            this.tpTimer.PerformLayout();
+            this.tabControl1.ResumeLayout(false);
+            this.tabPage1.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.TextBox txtMaterialCode;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.TextBox textMaterialName;
+        private System.Windows.Forms.Button tsbPrint;
+        private System.Windows.Forms.DataGridView DGView;
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn MAINCODE;
+        private System.Windows.Forms.DataGridViewTextBoxColumn MATERIAL_NAME;
+        private System.Windows.Forms.DataGridViewTextBoxColumn PRODUCTCODE;
+        private System.Windows.Forms.DataGridViewTextBoxColumn CREATETIME;
+        private System.Windows.Forms.ComboBox cbPrintCount;
+        private System.Windows.Forms.ComboBox cbPrintSpan;
+        private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.Button btnStart;
+        private System.Windows.Forms.Label lblLastCount;
+        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.Button btnStop;
+        private System.Windows.Forms.Timer timer2;
+        private System.Windows.Forms.ComboBox cbMould;
+        private System.Windows.Forms.Label label9;
+        private System.Windows.Forms.TabControl tabControl1;
+        private System.Windows.Forms.TabPage tabPage1;
+        private System.Windows.Forms.TabControl tpPrintMode;
+        private System.Windows.Forms.TabPage tpTimer;
+        private System.Windows.Forms.TabPage tpManual;
+        private System.Windows.Forms.Panel plPrintSetting;
+        private System.Windows.Forms.CheckBox cbTemplateDesign;
+        private System.Windows.Forms.TextBox textBox1;
+    }
+}
\ No newline at end of file
diff --git a/APPQ5/QMAPP.WinForm/Forms/Injection/SewingPrint.cs b/APPQ5/QMAPP.WinForm/Forms/Injection/SewingPrint.cs
new file mode 100644
index 0000000..4f1e991
--- /dev/null
+++ b/APPQ5/QMAPP.WinForm/Forms/Injection/SewingPrint.cs
@@ -0,0 +1,708 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using QMAPP.WinForm.Common;
+using QMAPP.Entity;
+using QMAPP.ServicesAgent;
+using QMAPP.FJC.Entity.Operation;
+using QMFrameWork.Common.Serialization;
+using QMAPP.WinForm.Forms.Operation;
+using QMAPP.FJC.Entity.Basic;
+using QMAPP.MD.Entity.Bucket;
+using QMAPP.MD.Entity;
+
+namespace QMAPP.WinForm.Forms.Injection
+{
+    public partial class SewingPrint : Form
+    {
+        //获取服务代理
+        QMAPP.ServicesAgent.ServiceAgent _agent = ClientContext.GetServiceAgent();
+        
+        List<ProcessParameter> paramcolumns = new List<ProcessParameter>();
+        FileSynchronizers.IFileSynchronizer sync;
+
+        public SewingPrint()
+        {
+            InitializeComponent();
+        }
+
+        private void InjectionCodePrint_Load(object sender, EventArgs e)
+        {
+            LoadMachineList();
+            SetConnectState(0);
+            
+            //this.radioButSignal.Checked = true;
+
+            PrintTempleCopyClass printClass = new PrintTempleCopyClass();
+            printClass.CopyPrintTemple("InjectionCodePrint");
+
+            cbPrintCount.SelectedIndex = 3;
+            cbPrintSpan.SelectedIndex = 3;
+        }
+
+        #region 加载零件号
+        /// <summary>
+        /// 加载设备列表
+        /// </summary>
+        private void LoadMachineList()
+        {
+            #region
+            
+            var material = new Material();
+            material.MATERIAL_TYPE_CODE = "IP_FENGREN"; //零件号类型
+            var materialResult = _agent.InvokeServiceFunction<List<Material>>("MaterialBLL_GetMaterialList", material);
+            materialResult.Insert(0, new Material { });
+            this.cbMould.DataSource = materialResult;
+            this.cbMould.DisplayMember = "MATERIAL_NAME";
+            this.cbMould.ValueMember = "MATERIAL_CODE";
+            
+            #endregion
+        }
+        #endregion
+
+        #region 打印
+        /// <summary>
+        /// 打印
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void tsbPrint_Click(object sender, EventArgs e)
+        {
+            //窗体数据校验
+            string errorMessae = ErrorCheck();
+            if (errorMessae != "")
+            {
+                MessageBox.Show(errorMessae, Resource1.ConfirmTitle, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                return;
+            }
+            tsbPrint.Enabled = false;
+            CodeCreatePrint();
+            tsbPrint.Enabled = true;
+        }
+
+        private void CodeCreatePrint()
+        {
+            Material materialInfo = new Material();
+            materialInfo.MATERIAL_CODE = cbMould.SelectedValue.ToString();
+            materialInfo.MATERIAL_NAME = cbMould.Text;
+            DataResult<List<PrintCode>> resultList = _agent.InvokeServiceFunction<DataResult<List<PrintCode>>>("MainOperationBLL_GetPrintCodeForMP4", materialInfo);
+            //var machine = new MachineInfo();
+            //machine.MACHINENAME = "";
+            //machine.MACHINECODDE = "";
+            //machine.WORKCENTER_CODE = "";
+            //machine.WORKCELL_CODE = "";
+            //DataResult<List<PrintCode>> resultList = _agent.InvokeServiceFunction<DataResult<List<PrintCode>>>("MainOperationBLL_GetPrintCodeWithParam", materialListInfo, machine, model, "", new Dictionary<string, string>());
+            try
+            {
+                Print(resultList.Result, true);
+            }
+            catch (Exception e)
+            {
+                var ss = e.Message;
+            }
+
+        }
+
+        private void CodeCreatePrint(string header, string datarow, char[] dataSeparator)
+        {
+            
+            List<Material> materialListInfo = GetSelectedMaterials();
+            //var machine = comMachine.SelectedItem as MachineInfo;
+            var model = cbMould.SelectedItem as MachineInfoModels;
+            if (model == null)
+            {
+                model = new MachineInfoModels();
+            }
+            string tableName = paramcolumns.FirstOrDefault().PARATABLENAME;
+            Dictionary<string,string> param=new Dictionary<string,string>();
+            param.Add("PARAMETER_COLUMNS",header);
+            var paramvalue=datarow.Split(dataSeparator);
+            for(int j=0;j<paramvalue.Length;j++)
+            {
+                if(j<paramcolumns.Count)
+                {
+                    param.Add(paramcolumns[j].PARANAME,paramvalue[j]);
+                }
+                else
+                {
+                    break;
+                }
+            }
+            int i = 1;
+            //DataResult<List<PrintCode>> resultList = _agent.InvokeServiceFunction<DataResult<List<PrintCode>>>("MainOperationBLL_GetPrintCodeWithParam", materialListInfo,machine,model,tableName,param);
+            //Print(resultList.Result,false);
+        }
+        private void Print(List<PrintCode> codeList,bool IsManual)
+        {
+            List<PrintTemplate.InjectLabel> labels = new List<PrintTemplate.InjectLabel>();
+            //打印条码
+            
+            string typeTem = "";
+            string typeData = "";
+            foreach (PrintCode item in codeList)
+            {
+                //创建新行
+                var row = new DataGridViewRow();
+                if (DGView.Rows.Count == 0)
+                {
+                    var index = this.DGView.Rows.Add();
+                    row = DGView.Rows[index];
+                }
+                else
+                {
+                    this.DGView.Rows.InsertCopy(0, 0);
+                    row = DGView.Rows[0];
+                }
+                //对datagridview赋值
+                row.Cells["MATERIAL_NAME"].Value = item.MATERIAL_NAME;
+                row.Cells["PRODUCTCODE"].Value = item.PRODUCTCODE;
+                row.Cells["MAINCODE"].Value = item.MAINCODE;
+                row.Cells["CREATETIME"].Value = DateTime.Now;
+
+                if (DGView.Rows.Count > 200)
+                {
+                    DGView.Rows.RemoveAt(200);
+                }
+                //班次信息
+                string shiftCode = ClientContext.produceShift.PRODUCESHIFTTCODE;
+                item.ShiftCode = shiftCode;
+
+                DGView.AutoGenerateColumns = false;
+                typeTem = item.PRINT_TEMPALTE_TEM;
+                typeData = item.PRINT_TEMPALTE_DATA;
+                //QM.Assist.LabelInfo ll = new QM.Assist.LabelInfo();
+                //ll.BarCode = item.MATERIAL_NAME + "," + item.PRODUCTCODE + "," + item.MAINCODE + "," + shiftCode + "," + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                //QM.Assist.PrintUtil.LabelList2.Add(ll);
+                PrintTemplate.InjectLabel label = new PrintTemplate.InjectLabel
+                {
+                    CreateDate = DateTime.Now,
+                    //MachineCode = comMachine.SelectedValue + "",
+                    MaterialCode = item.PRODUCTCODE,
+                    MaterialName = item.MATERIAL_NAME,
+                    ModelCode = cbMould.SelectedValue + "",
+                    SerialNumber = item.MAINCODE,
+                    ShiftCode = shiftCode,
+                    IsManualPrint = IsManual
+                };
+                labels.Add(label);
+            }
+            string path = System.Configuration.ConfigurationManager.AppSettings["Template_Local_Path"];
+            if (!System.IO.Directory.Exists(path))
+            {
+                System.IO.Directory.CreateDirectory(path);
+            }
+            FastReport.Report fr = new FastReport.Report();
+            fr.RegisterData(labels, "Labels");
+            if (!System.IO.File.Exists(string.Format("{0}\\{1}.frx", path, typeTem)))
+            {
+                if (System.IO.File.Exists(string.Format("PrintTemplate\\{1}.frx", path, typeTem)))
+                {
+                    System.IO.File.Copy(string.Format("PrintTemplate\\{1}.frx", path, typeTem)
+                        , string.Format("{0}\\{1}.frx", path, typeTem));
+                }
+                else
+                {
+                    fr.FileName = string.Format("{0}\\{1}.frx", path, typeTem);
+                    fr.Design(true);
+                    fr.Save(string.Format("{0}\\{1}.frx", path, typeTem));
+                }
+            }
+            fr.Load(string.Format("{0}\\{1}.frx", path, typeTem));
+
+            
+                if (cbTemplateDesign.Enabled && cbTemplateDesign.Checked)
+                {
+                    try
+                    {
+                        fr.Design(true);
+                    }
+                    catch (Exception e)
+                    {
+                        var ss = e.Message;
+                    }
+
+                }
+                else
+                {
+                    try
+                    {
+                        fr.PrintSettings.ShowDialog = false;
+                        fr.Print();
+                    }
+                    catch (Exception e)
+                    {
+                        var ss = e.Message;
+                    }
+
+
+                    #region 张松男20210802  修改   增加新版注塑投料条码绑定
+
+                    foreach (var la in labels)
+                    {
+                        var material_T = new BucketMaterialClass() { MaterialCode = la.MaterialCode };
+                        var List = _agent.InvokeServiceFunction<List<RawMaterial>>(B9BasicService.RawMaterialBLL_GetListTo.ToString(), material_T);
+
+                        if (List != null && List.Count > 0)
+                        {
+                            foreach (var raw in List)
+                            {
+                                var record = new RawMaterialRecord();
+                                record.MaterialCode = la.MaterialCode;
+                                record.MaterialName = la.MaterialName;
+                                record.ProductCode = la.SerialNumber;
+                                record.RawMaterialPID = raw.PID;
+                                record.MachineCode = la.MachineCode;
+                                _agent.InvokeServiceFunction<DataResult<int>>(B9BasicService.RawMaterialRecordBLL_Insert.ToString(), record);
+                            }
+                        }
+                    }
+
+                    #endregion
+
+                }
+                try
+                {
+                    fr.Dispose();
+                }
+                catch (Exception e)
+                {
+                    var ss = e.Message;
+                }
+
+            
+
+            //QM.Assist.PrintUtil pu = new QM.Assist.PrintUtil();
+            //pu.PrintLabel2(System.Configuration.ConfigurationManager.AppSettings["proPath"].ToString
+            //    (), System.Configuration.ConfigurationManager.AppSettings[typeTem + "temPath"].ToString
+            //    (), System.Configuration.ConfigurationManager.AppSettings[typeData + "dataPath"].ToString
+            //    ());
+        }
+
+        private List<Material> GetSelectedMaterials()
+        {
+            List<Material> materialListInfo = new List<Material>();
+            Material concationMaterial = new Material();
+            //int i= Convert.ToInt32( this.txtNum.Text);
+
+            //if (this.radioButSignal.Checked == true)
+            //{
+            //    string materialcode1 = this.txtMaterialCode.Text;
+            //    concationMaterial.MATERIAL_CODE = materialcode1;
+            //    materialListInfo.Add(concationMaterial);
+            //}
+            //else if (this.radioButDouble.Checked == true)
+            //{
+            //    concationMaterial.MATERIAL_CODE = this.txtMaterialCode.Text;
+            //    materialListInfo.Add(concationMaterial);
+            //    if (!string.IsNullOrEmpty(this.comboxMaterial.SelectedValue.ToString()))
+            //    {
+            //        Material concationMaterial2 = new Material();
+            //        concationMaterial2.MATERIAL_CODE = this.comboxMaterial.SelectedValue.ToString();
+            //        materialListInfo.Add(concationMaterial2);
+            //    }
+            //}
+            //else if (this.radioButFourth.Checked == true)
+            //{
+            //    concationMaterial.MATERIAL_CODE = this.txtMaterialCode.Text;
+            //    materialListInfo.Add(concationMaterial);
+
+            //    if (!string.IsNullOrEmpty(this.txtMaterial2.Text))
+            //    {
+            //        Material concationMaterial3 = new Material();
+            //        concationMaterial3.MATERIAL_CODE = this.txtMaterial2.Text.Substring(this.txtMaterial2.Text.LastIndexOf(":") + 1);
+            //        materialListInfo.Add(concationMaterial3);
+            //    }
+
+            //    if (!string.IsNullOrEmpty(this.txtMaterial3.Text))
+            //    {
+            //        Material concationMaterial4 = new Material();
+            //        concationMaterial4.MATERIAL_CODE = this.txtMaterial3.Text.Substring(this.txtMaterial3.Text.LastIndexOf(":") + 1);
+            //        materialListInfo.Add(concationMaterial4);
+            //    }
+            //    if (!string.IsNullOrEmpty(this.txtMaterial4.Text))
+            //    {
+            //        Material concationMaterial5 = new Material();
+            //        concationMaterial5.MATERIAL_CODE = this.txtMaterial4.Text.Substring(this.txtMaterial4.Text.LastIndexOf(":") + 1);
+            //        materialListInfo.Add(concationMaterial5);
+            //    }
+            //}
+            return materialListInfo;
+        }
+        #endregion 
+
+        #region 校验
+        /// <summary>
+        /// 校验
+        /// </summary>
+        /// <returns></returns>
+        private string ErrorCheck()
+        {
+            #region
+            string strMessage = "";
+            
+            if (cbMould.Items.Count > 0 && cbMould.SelectedIndex < 0)
+            {
+                strMessage += "请选择零件！" + "\r\n";
+            }
+
+            //注塑零件
+            if (this.txtMaterialCode.Text == null || this.txtMaterialCode.Text == string.Empty)
+            {
+                strMessage += Resource1.MaterialChoiceValidate + "\r\n";
+            }
+
+            
+            return strMessage;
+            #endregion
+        }
+        #endregion
+
+        #region 窗体关闭
+        /// <summary>
+        /// 窗体关闭
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void tsbClose_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+        #endregion 
+
+        #region 点击选择零件信息
+        /// <summary>
+        /// 点击选择零件信息
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnChoiceMaterial_Click(object sender, EventArgs e)
+        {
+            MaterialTreeForm materialForm = new MaterialTreeForm();
+            var ret= materialForm.ShowDialog();
+            if (ret == DialogResult.OK)
+            {
+                this.txtMaterialCode.Text = materialForm.MaterialCode;
+                this.textMaterialName.Text = materialForm.MaterialName;
+                bool maintype = materialForm.MainType;
+                if (maintype)
+                {
+                    //this.groupBox3.Enabled = true;
+                }
+                else
+                {
+                    //this.groupBox3.Enabled = false;
+                }
+            }
+        }
+        #endregion 
+
+       
+
+
+        /// <summary>
+        /// 所选零件发生改变
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void txtMaterialCode_TextChanged(object sender, EventArgs e)
+        {
+            //radioButSignal.Checked = true;
+        }
+
+        
+
+        private void btnStart_Click(object sender, EventArgs e)
+        {
+            //窗体数据校验
+            string errorMessae = ErrorCheck();
+            if (errorMessae != "")
+            {
+                MessageBox.Show(errorMessae, Resource1.ConfirmTitle, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                return;
+            }
+            btnStart.Enabled = false;
+            btnStop.Enabled = true;
+            cbPrintCount.Enabled = false;
+            cbPrintSpan.Enabled = false;
+            lblLastCount.Text = cbPrintCount.Text;
+            tsbPrint.Enabled = false;
+            //btnChoiceMaterial.Enabled = false;
+            //groupBox3.Enabled = false;
+            printtimer = int.Parse(cbPrintSpan.Text.Trim('s'));
+            LockPrintMode(2);
+
+        }
+
+        private void btnStop_Click(object sender, EventArgs e)
+        {
+            btnStart.Enabled = true;
+            btnStop.Enabled = false;
+            cbPrintCount.Enabled = true;
+            cbPrintSpan.Enabled = true;
+            //lblLastCount.Text = cbPrintCount.Text;
+            tsbPrint.Enabled = true;
+            //btnChoiceMaterial.Enabled = true;
+            //groupBox3.Enabled = true;
+            LockPrintMode(-1);
+        }
+
+        int printtimer = 0;
+
+        private void timer2_Tick(object sender, EventArgs e)
+        {
+            if (!btnStart.Enabled&&btnStop.Enabled)
+            {
+                int span=int.Parse(cbPrintSpan.Text.Trim('s'));
+                if (printtimer >= span)
+                {
+                    CodeCreatePrint();
+                    printtimer = 0;
+                    var lastcount = int.Parse(lblLastCount.Text) - 1;
+                    lblLastCount.Text = lastcount + "";
+                    if (lastcount <= 0)
+                    {
+                        btnStop_Click(sender, e);
+                    }
+
+                }
+                else
+                {
+                    printtimer++;
+                }
+            }
+            else
+            {
+                printtimer = 0;
+            }
+        }
+
+        private void comMachine_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            //var selectmachine = comMachine.SelectedItem as MachineInfo;
+            //if (selectmachine != null && !string.IsNullOrEmpty(selectmachine.PID))
+            //{
+            //    var mouldList = _agent.InvokeServiceFunction<List<MachineInfoModels>>(B9BasicService.MachineInfoModelBLL_GetAllList.ToString(), new MachineInfoModels { MID = "INJ_MODEL" }).OrderBy(p => p.MODELCODE).ToList();
+            //    mouldList.Insert(0, new MachineInfoModels { });
+            //    cbMould.DisplayMember = "MODELNAME";
+            //    cbMould.ValueMember = "MODELCODE";
+            //    cbMould.DataSource = mouldList.ToList();
+
+            //    if (selectmachine.ISCONTROL == "1")
+            //    {
+            //        HideTimerPrint(true);
+            //    }
+            //    else
+            //    {
+            //        HideTimerPrint(false);
+            //    }
+            //}
+            
+        }
+
+        private void txtCode_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)//如果输入的是回车键
+            {
+
+            }
+        }
+
+        private void btnStartFileScan_Click(object sender, EventArgs e)
+        {
+            //窗体数据校验
+            string errorMessae = ErrorCheck();
+            if (errorMessae != "")
+            {
+                MessageBox.Show(errorMessae, Resource1.ConfirmTitle, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                return;
+            }
+            //var selectmachine= comMachine.SelectedItem as MachineInfo;
+            //if (selectmachine != null&&!string.IsNullOrEmpty(selectmachine.PID))
+            //{
+            //    //txtFilePath.Text = selectmachine.EQUIPMENT_DIRECTORY;
+            //    var columns = _agent.InvokeServiceFunction<DataResult<List<ProcessParameter>>>("ProcessParameterBLL_GetAllList", new ProcessParameter { MACHINECODDE = selectmachine.MACHINECODDE }).Result;
+            //    if (columns != null)
+            //    {
+            //        paramcolumns = columns;
+            //    }
+            //    else
+            //    {
+            //        paramcolumns = new List<ProcessParameter>();
+            //    }
+            //    //lvParamRecords.Items.Clear();
+            //    //lvParamRecords.Columns.Clear();
+            //    //var c1=lvParamRecords.Columns.Add("扫描时间");
+            //    //c1.Width=180;
+            //    foreach (var col in paramcolumns)
+            //    {
+            //        //var  c= lvParamRecords.Columns.Add(col.PARADESCRIBE);
+            //    }
+            //    if (selectmachine.EQUIPMENT_TYPE_CODE == "HaitianInjection")
+            //    {
+            //        sync = new FileSynchronizers.HaitianInjectionFileSynchronizer(selectmachine);
+            //    }
+            //    else if (selectmachine.EQUIPMENT_TYPE_CODE == "EngelInjection")
+            //    {
+            //        sync = new FileSynchronizers.EngelInjectionFileSynchronizer(selectmachine);
+            //    }
+            //    else
+            //    {
+            //        MessageBox.Show("注塑机型号未设定！", Resource1.ConfirmTitle, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+            //        return;
+            //    }
+            //    sync.NewRecordFound += new EventHandler<FileSynchronizers.InjParamEventArgs>(sync_NewRecordFound);
+            //    sync.ExceptionCatched += new EventHandler<FileSynchronizers.InjParamEventArgs>(sync_ExceptionCatched);
+            //    //sync.Start(cbSkipHistory.Checked);
+            //    SetConnectState(1);
+            //    //btnStartFileScan.Enabled = false;
+            //    //btnStopFileScan.Enabled = true;
+            //    LockPrintMode(0);
+            //}
+            //else
+            //{
+            //    MessageBox.Show("请选择注塑机！", Resource1.ConfirmTitle, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+            //}
+        }
+        /// <summary>
+        /// 设置连接状态
+        /// </summary>
+        /// <param name="state">0：停止 1：正常 2：断开</param>
+        void SetConnectState(int state)
+        {
+            switch (state)
+            {
+                case 0:
+                    {
+                        //txtConnectState.Text = "扫描停止";
+                        //picConnectState.Image = WinForm.Resource1.stop;
+                        break;
+                    }
+                case 1:
+                    {
+                        //txtConnectState.Text = "扫描正常";
+                        //picConnectState.Image = WinForm.Resource1.reload;
+                        break;
+                    }
+                case 2:
+                    {
+                        //txtConnectState.Text = "连接断开";
+                        //picConnectState.Image = WinForm.Resource1.no;
+                        break;
+                    }
+            }
+        }
+        /// <summary>
+        /// 锁定打印模式
+        /// </summary>
+        /// <param name="mode">-1 解锁; 0 联机; 1 手动; 2 定时;</param>
+        void LockPrintMode(int mode)
+        {
+            for(int i=0;i<tpPrintMode.Controls.Count;i++)
+            {
+                if(i==mode)
+                {
+                    tpPrintMode.Controls[i].Enabled = true;
+                }
+                else if (mode < 0)
+                {
+                    tpPrintMode.Controls[i].Enabled = true;
+                }
+                else
+                {
+                    tpPrintMode.Controls[i].Enabled = false;
+                }
+            }
+            plPrintSetting.Enabled = mode < 0;
+        }
+
+
+        /// <summary>
+        /// 隐藏定时打印模式
+        /// </summary>
+        void HideTimerPrint(bool hide)
+        {
+            if (hide)
+            {
+                if (tpPrintMode.Controls.Contains(tpTimer))
+                    //tpPrintMode.Controls[tpTimer.Name].Visible = !hide;
+                    tpPrintMode.Controls.Remove(tpTimer);
+            }
+            else
+            {
+                if (!tpPrintMode.Controls.Contains(tpTimer))
+                    //tpPrintMode.Controls[tpTimer.Name].Visible = !hide;
+                    tpPrintMode.Controls.Add(tpTimer);
+            }
+        }
+        
+
+        private void InjectionCodePrint_FormClosed(object sender, FormClosedEventArgs e)
+        {
+            if (sync != null)
+            {
+                sync.Stop();
+            }
+        }
+
+        private void btnLockMachine_Click(object sender, EventArgs e)
+        {
+            LockMachine(true);
+
+           /* if (this.btnLockMachine.Tag.ToString().Equals("0"))
+            {
+
+                LockMachine(false);
+            }
+            else
+            {
+                LockMachine(true);
+            }*/
+        }
+        #region 设备锁定
+        /// <summary>
+        /// 设备锁定
+        /// </summary>
+        /// <param name="lockFlag"></param>
+        private void LockMachine(bool lockFlag)
+        {
+            //this.comMachine.Enabled = lockFlag;
+            ////this.comProductType.Enabled = lockFlag;
+            //if (lockFlag)
+            //{
+
+            //    this.btnLockMachine.Text = "锁定";
+            //    this.btnLockMachine.Tag = "0";
+            //}
+            //else
+            //{
+            //    ClientContext.MachineInfo = this.comMachine.SelectedItem as MachineInfo;
+            //    string locationfile = System.Configuration.ConfigurationManager.AppSettings["loactionfile"];
+            //    System.IO.File.WriteAllText(locationfile, this.comMachine.SelectedValue.ToString());
+            //    this.btnLockMachine.Text = "解锁";
+            //    this.btnLockMachine.Tag = "1";
+            //}
+
+        }
+        #endregion
+
+        private void cbMould_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (cbMould.SelectedValue != null && cbMould.SelectedValue.ToString() != "QMAPP.MD.Entity.Material")
+            {
+                textMaterialName.Text = cbMould.Text;
+                txtMaterialCode.Text = cbMould.SelectedValue.ToString();
+            }
+            else
+            {
+                textMaterialName.Text = "";
+                txtMaterialCode.Text = "";
+            }
+            
+        }
+    }
+}
diff --git a/APPQ5/QMAPP.WinForm/Forms/Injection/SewingPrint.resx b/APPQ5/QMAPP.WinForm/Forms/Injection/SewingPrint.resx
new file mode 100644
index 0000000..cd9c729
--- /dev/null
+++ b/APPQ5/QMAPP.WinForm/Forms/Injection/SewingPrint.resx
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="MAINCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="MATERIAL_NAME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="PRODUCTCODE.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="CREATETIME.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>107, 17</value>
+  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>33</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.Designer.cs b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.Designer.cs
index 98a9e45..5082ef9 100644
--- a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.Designer.cs
+++ b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.Designer.cs
@@ -29,37 +29,37 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OperationForm));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle43 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle51 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle52 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle44 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle45 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle46 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle47 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle48 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle49 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle50 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle53 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle60 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle54 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle55 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle56 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle57 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle58 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle59 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
             this.panel2 = new System.Windows.Forms.Panel();
             this.tBMat = new System.Windows.Forms.TextBox();
             this.cBoxVAN = new System.Windows.Forms.CheckBox();
@@ -163,6 +163,7 @@
             this.PType = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.OPERATESTATE = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.timer1 = new System.Windows.Forms.Timer(this.components);
+            this.txtGlue = new System.Windows.Forms.Label();
             this.panel2.SuspendLayout();
             this.panelSearch.SuspendLayout();
             this.plDAI.SuspendLayout();
@@ -184,6 +185,7 @@
             // panel2
             // 
             this.panel2.BackColor = System.Drawing.SystemColors.InactiveBorder;
+            this.panel2.Controls.Add(this.txtGlue);
             this.panel2.Controls.Add(this.tBMat);
             this.panel2.Controls.Add(this.cBoxVAN);
             this.panel2.Controls.Add(this.btnChange);
@@ -199,8 +201,9 @@
             this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.panel2.Location = new System.Drawing.Point(0, 0);
+            this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(1698, 148);
+            this.panel2.Size = new System.Drawing.Size(2524, 222);
             this.panel2.TabIndex = 15;
             // 
             // tBMat
@@ -208,17 +211,19 @@
             this.tBMat.BackColor = System.Drawing.SystemColors.InactiveBorder;
             this.tBMat.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.tBMat.Font = new System.Drawing.Font("微软雅黑", 24F, System.Drawing.FontStyle.Bold);
-            this.tBMat.Location = new System.Drawing.Point(773, 101);
+            this.tBMat.Location = new System.Drawing.Point(1160, 152);
+            this.tBMat.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tBMat.Name = "tBMat";
-            this.tBMat.Size = new System.Drawing.Size(335, 43);
+            this.tBMat.Size = new System.Drawing.Size(502, 64);
             this.tBMat.TabIndex = 13;
             // 
             // cBoxVAN
             // 
             this.cBoxVAN.AutoSize = true;
-            this.cBoxVAN.Location = new System.Drawing.Point(832, 27);
+            this.cBoxVAN.Location = new System.Drawing.Point(1248, 40);
+            this.cBoxVAN.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.cBoxVAN.Name = "cBoxVAN";
-            this.cBoxVAN.Size = new System.Drawing.Size(49, 21);
+            this.cBoxVAN.Size = new System.Drawing.Size(70, 28);
             this.cBoxVAN.TabIndex = 12;
             this.cBoxVAN.Text = "82V";
             this.cBoxVAN.UseVisualStyleBackColor = true;
@@ -227,9 +232,10 @@
             // btnChange
             // 
             this.btnChange.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnChange.Location = new System.Drawing.Point(1058, 17);
+            this.btnChange.Location = new System.Drawing.Point(1587, 26);
+            this.btnChange.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnChange.Name = "btnChange";
-            this.btnChange.Size = new System.Drawing.Size(96, 31);
+            this.btnChange.Size = new System.Drawing.Size(144, 46);
             this.btnChange.TabIndex = 11;
             this.btnChange.Text = "切换设备";
             this.btnChange.UseVisualStyleBackColor = true;
@@ -241,9 +247,10 @@
             this.cbMould.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cbMould.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.cbMould.FormattingEnabled = true;
-            this.cbMould.Location = new System.Drawing.Point(895, 18);
+            this.cbMould.Location = new System.Drawing.Point(1342, 27);
+            this.cbMould.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.cbMould.Name = "cbMould";
-            this.cbMould.Size = new System.Drawing.Size(151, 29);
+            this.cbMould.Size = new System.Drawing.Size(224, 39);
             this.cbMould.TabIndex = 10;
             this.cbMould.SelectedIndexChanged += new System.EventHandler(this.cbMould_SelectedIndexChanged);
             // 
@@ -253,20 +260,22 @@
             this.lblError.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.lblError.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.lblError.Font = new System.Drawing.Font("微软雅黑", 24F, System.Drawing.FontStyle.Bold);
-            this.lblError.Location = new System.Drawing.Point(0, 54);
+            this.lblError.Location = new System.Drawing.Point(0, 81);
+            this.lblError.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.lblError.Multiline = true;
             this.lblError.Name = "lblError";
             this.lblError.ReadOnly = true;
-            this.lblError.Size = new System.Drawing.Size(1698, 94);
+            this.lblError.Size = new System.Drawing.Size(2524, 141);
             this.lblError.TabIndex = 9;
             this.lblError.Text = "文字信息";
             // 
             // lblLock
             // 
             this.lblLock.AutoSize = true;
-            this.lblLock.Location = new System.Drawing.Point(1160, 22);
+            this.lblLock.Location = new System.Drawing.Point(1740, 33);
+            this.lblLock.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblLock.Name = "lblLock";
-            this.lblLock.Size = new System.Drawing.Size(56, 17);
+            this.lblLock.Size = new System.Drawing.Size(82, 24);
             this.lblLock.TabIndex = 8;
             this.lblLock.TabStop = true;
             this.lblLock.Tag = "0";
@@ -278,18 +287,20 @@
             this.comMachine.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comMachine.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.comMachine.FormattingEnabled = true;
-            this.comMachine.Location = new System.Drawing.Point(631, 18);
+            this.comMachine.Location = new System.Drawing.Point(946, 27);
+            this.comMachine.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.comMachine.Name = "comMachine";
-            this.comMachine.Size = new System.Drawing.Size(195, 29);
+            this.comMachine.Size = new System.Drawing.Size(290, 39);
             this.comMachine.TabIndex = 7;
             this.comMachine.SelectionChangeCommitted += new System.EventHandler(this.comMachine_SelectionChangeCommitted);
             // 
             // btnAdd
             // 
             this.btnAdd.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnAdd.Location = new System.Drawing.Point(463, 17);
+            this.btnAdd.Location = new System.Drawing.Point(694, 26);
+            this.btnAdd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnAdd.Name = "btnAdd";
-            this.btnAdd.Size = new System.Drawing.Size(65, 31);
+            this.btnAdd.Size = new System.Drawing.Size(98, 46);
             this.btnAdd.TabIndex = 6;
             this.btnAdd.Text = "提交";
             this.btnAdd.UseVisualStyleBackColor = true;
@@ -299,9 +310,10 @@
             // 
             this.txtCode.Font = new System.Drawing.Font("微软雅黑", 12F);
             this.txtCode.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.txtCode.Location = new System.Drawing.Point(90, 18);
+            this.txtCode.Location = new System.Drawing.Point(135, 27);
+            this.txtCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtCode.Name = "txtCode";
-            this.txtCode.Size = new System.Drawing.Size(367, 29);
+            this.txtCode.Size = new System.Drawing.Size(548, 39);
             this.txtCode.TabIndex = 5;
             this.txtCode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtCode_KeyDown);
             // 
@@ -309,9 +321,10 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(7, 22);
+            this.label1.Location = new System.Drawing.Point(10, 33);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(82, 20);
+            this.label1.Size = new System.Drawing.Size(131, 30);
             this.label1.TabIndex = 0;
             this.label1.Text = "条       码：";
             // 
@@ -319,9 +332,10 @@
             // 
             this.lblMouldTitle.AutoSize = true;
             this.lblMouldTitle.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblMouldTitle.Location = new System.Drawing.Point(837, 22);
+            this.lblMouldTitle.Location = new System.Drawing.Point(1256, 33);
+            this.lblMouldTitle.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblMouldTitle.Name = "lblMouldTitle";
-            this.lblMouldTitle.Size = new System.Drawing.Size(54, 20);
+            this.lblMouldTitle.Size = new System.Drawing.Size(82, 30);
             this.lblMouldTitle.TabIndex = 4;
             this.lblMouldTitle.Text = "模架：";
             // 
@@ -329,9 +343,10 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(544, 22);
+            this.label2.Location = new System.Drawing.Point(816, 33);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(84, 20);
+            this.label2.Size = new System.Drawing.Size(128, 30);
             this.label2.TabIndex = 4;
             this.label2.Text = "当前设备：";
             // 
@@ -346,27 +361,30 @@
             this.panelSearch.Controls.Add(this.label3);
             this.panelSearch.Dock = System.Windows.Forms.DockStyle.Top;
             this.panelSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.panelSearch.Location = new System.Drawing.Point(0, 148);
+            this.panelSearch.Location = new System.Drawing.Point(0, 222);
+            this.panelSearch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.panelSearch.Name = "panelSearch";
-            this.panelSearch.Size = new System.Drawing.Size(1698, 35);
+            this.panelSearch.Size = new System.Drawing.Size(2524, 52);
             this.panelSearch.TabIndex = 17;
             // 
             // lblMould
             // 
             this.lblMould.AutoSize = true;
             this.lblMould.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblMould.Location = new System.Drawing.Point(498, 4);
+            this.lblMould.Location = new System.Drawing.Point(747, 6);
+            this.lblMould.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblMould.Name = "lblMould";
-            this.lblMould.Size = new System.Drawing.Size(0, 26);
+            this.lblMould.Size = new System.Drawing.Size(0, 37);
             this.lblMould.TabIndex = 5;
             // 
             // lblWorkcellState
             // 
             this.lblWorkcellState.AutoSize = true;
             this.lblWorkcellState.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblWorkcellState.Location = new System.Drawing.Point(204, 4);
+            this.lblWorkcellState.Location = new System.Drawing.Point(306, 6);
+            this.lblWorkcellState.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblWorkcellState.Name = "lblWorkcellState";
-            this.lblWorkcellState.Size = new System.Drawing.Size(50, 26);
+            this.lblWorkcellState.Size = new System.Drawing.Size(73, 37);
             this.lblWorkcellState.TabIndex = 0;
             this.lblWorkcellState.Text = "准备";
             // 
@@ -374,9 +392,10 @@
             // 
             this.lblMouldTitle2.AutoSize = true;
             this.lblMouldTitle2.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblMouldTitle2.Location = new System.Drawing.Point(415, 7);
+            this.lblMouldTitle2.Location = new System.Drawing.Point(622, 10);
+            this.lblMouldTitle2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblMouldTitle2.Name = "lblMouldTitle2";
-            this.lblMouldTitle2.Size = new System.Drawing.Size(84, 20);
+            this.lblMouldTitle2.Size = new System.Drawing.Size(128, 30);
             this.lblMouldTitle2.TabIndex = 6;
             this.lblMouldTitle2.Text = "当前模架：";
             // 
@@ -384,9 +403,10 @@
             // 
             this.label9.AutoSize = true;
             this.label9.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label9.Location = new System.Drawing.Point(5, 6);
+            this.label9.Location = new System.Drawing.Point(8, 9);
+            this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(74, 22);
+            this.label9.Size = new System.Drawing.Size(110, 31);
             this.label9.TabIndex = 0;
             this.label9.Text = "数据采集";
             // 
@@ -394,9 +414,10 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(125, 7);
+            this.label3.Location = new System.Drawing.Point(188, 10);
+            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(84, 20);
+            this.label3.Size = new System.Drawing.Size(128, 30);
             this.label3.TabIndex = 4;
             this.label3.Text = "当前状态：";
             // 
@@ -404,9 +425,10 @@
             // 
             this.plDAI.Controls.Add(this.DGView);
             this.plDAI.Dock = System.Windows.Forms.DockStyle.Top;
-            this.plDAI.Location = new System.Drawing.Point(0, 183);
+            this.plDAI.Location = new System.Drawing.Point(0, 274);
+            this.plDAI.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.plDAI.Name = "plDAI";
-            this.plDAI.Size = new System.Drawing.Size(1698, 127);
+            this.plDAI.Size = new System.Drawing.Size(2524, 190);
             this.plDAI.TabIndex = 18;
             // 
             // DGView
@@ -415,14 +437,14 @@
             this.DGView.AllowUserToDeleteRows = false;
             this.DGView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells;
             this.DGView.BackgroundColor = System.Drawing.SystemColors.ButtonFace;
-            dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle31.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle31.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold);
-            dataGridViewCellStyle31.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle31.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle31.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.DGView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle31;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold);
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.DGView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
             this.DGView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.DGView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.dgcMouldCode,
@@ -435,31 +457,32 @@
             this.davalue,
             this.daresult,
             this.Pid});
-            dataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle41.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle41.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle41.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle41.Padding = new System.Windows.Forms.Padding(0, 0, 14, 0);
-            dataGridViewCellStyle41.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle41.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle41.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.DGView.DefaultCellStyle = dataGridViewCellStyle41;
+            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle11.Padding = new System.Windows.Forms.Padding(0, 0, 14, 0);
+            dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.DGView.DefaultCellStyle = dataGridViewCellStyle11;
             this.DGView.Dock = System.Windows.Forms.DockStyle.Fill;
             this.DGView.GridColor = System.Drawing.SystemColors.ControlDarkDark;
             this.DGView.Location = new System.Drawing.Point(0, 0);
+            this.DGView.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.DGView.Name = "DGView";
             this.DGView.ReadOnly = true;
-            dataGridViewCellStyle42.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle42.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle42.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle42.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle42.SelectionBackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle42.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle42.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.DGView.RowHeadersDefaultCellStyle = dataGridViewCellStyle42;
+            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle12.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.DGView.RowHeadersDefaultCellStyle = dataGridViewCellStyle12;
             this.DGView.RowTemplate.Height = 30;
             this.DGView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.DGView.Size = new System.Drawing.Size(1698, 127);
+            this.DGView.Size = new System.Drawing.Size(2524, 190);
             this.DGView.TabIndex = 3;
             this.DGView.Tag = "0";
             this.DGView.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.DG_RowPostPaint);
@@ -467,9 +490,9 @@
             // dgcMouldCode
             // 
             this.dgcMouldCode.DataPropertyName = "MouldCode";
-            dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle32.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold);
-            this.dgcMouldCode.DefaultCellStyle = dataGridViewCellStyle32;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 15.75F, System.Drawing.FontStyle.Bold);
+            this.dgcMouldCode.DefaultCellStyle = dataGridViewCellStyle2;
             this.dgcMouldCode.HeaderText = "模架编号";
             this.dgcMouldCode.Name = "dgcMouldCode";
             this.dgcMouldCode.ReadOnly = true;
@@ -479,28 +502,28 @@
             // dgcMouldName
             // 
             this.dgcMouldName.DataPropertyName = "MouldName";
-            dataGridViewCellStyle33.Font = new System.Drawing.Font("微软雅黑", 15.25F, System.Drawing.FontStyle.Bold);
-            this.dgcMouldName.DefaultCellStyle = dataGridViewCellStyle33;
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 15.25F, System.Drawing.FontStyle.Bold);
+            this.dgcMouldName.DefaultCellStyle = dataGridViewCellStyle3;
             this.dgcMouldName.HeaderText = "模架";
             this.dgcMouldName.Name = "dgcMouldName";
             this.dgcMouldName.ReadOnly = true;
-            this.dgcMouldName.Width = 81;
+            this.dgcMouldName.Width = 110;
             // 
             // daname
             // 
             this.daname.DataPropertyName = "DAName";
-            dataGridViewCellStyle34.Font = new System.Drawing.Font("宋体", 15.75F);
-            this.daname.DefaultCellStyle = dataGridViewCellStyle34;
+            dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 15.75F);
+            this.daname.DefaultCellStyle = dataGridViewCellStyle4;
             this.daname.HeaderText = "采集项名称";
             this.daname.Name = "daname";
             this.daname.ReadOnly = true;
-            this.daname.Width = 132;
+            this.daname.Width = 185;
             // 
             // statename
             // 
             this.statename.DataPropertyName = "StateName";
-            dataGridViewCellStyle35.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.statename.DefaultCellStyle = dataGridViewCellStyle35;
+            dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.statename.DefaultCellStyle = dataGridViewCellStyle5;
             this.statename.HeaderText = "采集时序";
             this.statename.Name = "statename";
             this.statename.ReadOnly = true;
@@ -510,19 +533,19 @@
             // datype
             // 
             this.datype.DataPropertyName = "DAType";
-            dataGridViewCellStyle36.Font = new System.Drawing.Font("宋体", 15.75F);
-            this.datype.DefaultCellStyle = dataGridViewCellStyle36;
+            dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 15.75F);
+            this.datype.DefaultCellStyle = dataGridViewCellStyle6;
             this.datype.HeaderText = "数据类型";
             this.datype.Name = "datype";
             this.datype.ReadOnly = true;
-            this.datype.Width = 115;
+            this.datype.Width = 160;
             // 
             // materialtypename
             // 
             this.materialtypename.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
             this.materialtypename.DataPropertyName = "MaterialCode";
-            dataGridViewCellStyle37.Font = new System.Drawing.Font("宋体", 15.75F);
-            this.materialtypename.DefaultCellStyle = dataGridViewCellStyle37;
+            dataGridViewCellStyle7.Font = new System.Drawing.Font("宋体", 15.75F);
+            this.materialtypename.DefaultCellStyle = dataGridViewCellStyle7;
             this.materialtypename.FillWeight = 50F;
             this.materialtypename.HeaderText = "物料类型";
             this.materialtypename.Name = "materialtypename";
@@ -532,8 +555,8 @@
             // 
             this.dgcDAMaterialCode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
             this.dgcDAMaterialCode.DataPropertyName = "MaterialName";
-            dataGridViewCellStyle38.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dgcDAMaterialCode.DefaultCellStyle = dataGridViewCellStyle38;
+            dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgcDAMaterialCode.DefaultCellStyle = dataGridViewCellStyle8;
             this.dgcDAMaterialCode.FillWeight = 50F;
             this.dgcDAMaterialCode.HeaderText = "物料名称";
             this.dgcDAMaterialCode.Name = "dgcDAMaterialCode";
@@ -543,8 +566,8 @@
             // 
             this.davalue.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
             this.davalue.DataPropertyName = "DAValue";
-            dataGridViewCellStyle39.Font = new System.Drawing.Font("宋体", 15.75F);
-            this.davalue.DefaultCellStyle = dataGridViewCellStyle39;
+            dataGridViewCellStyle9.Font = new System.Drawing.Font("宋体", 15.75F);
+            this.davalue.DefaultCellStyle = dataGridViewCellStyle9;
             this.davalue.HeaderText = "采集值";
             this.davalue.Name = "davalue";
             this.davalue.ReadOnly = true;
@@ -552,12 +575,12 @@
             // daresult
             // 
             this.daresult.DataPropertyName = "DAResult";
-            dataGridViewCellStyle40.Font = new System.Drawing.Font("宋体", 15.75F);
-            this.daresult.DefaultCellStyle = dataGridViewCellStyle40;
+            dataGridViewCellStyle10.Font = new System.Drawing.Font("宋体", 15.75F);
+            this.daresult.DefaultCellStyle = dataGridViewCellStyle10;
             this.daresult.HeaderText = "结果";
             this.daresult.Name = "daresult";
             this.daresult.ReadOnly = true;
-            this.daresult.Width = 81;
+            this.daresult.Width = 110;
             // 
             // Pid
             // 
@@ -589,9 +612,10 @@
             this.btnRefresh,
             this.toolStripButton1,
             this.toolStripButton3});
-            this.toolStrip1.Location = new System.Drawing.Point(0, 380);
+            this.toolStrip1.Location = new System.Drawing.Point(0, 570);
             this.toolStrip1.Name = "toolStrip1";
-            this.toolStrip1.Size = new System.Drawing.Size(1698, 70);
+            this.toolStrip1.Padding = new System.Windows.Forms.Padding(0, 0, 2, 0);
+            this.toolStrip1.Size = new System.Drawing.Size(2524, 105);
             this.toolStrip1.Stretch = true;
             this.toolStrip1.TabIndex = 19;
             this.toolStrip1.Text = "toolStrip1";
@@ -617,7 +641,7 @@
             this.tsbReSignal.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.tsbReSignal.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.tsbReSignal.Name = "tsbReSignal";
-            this.tsbReSignal.Size = new System.Drawing.Size(131, 67);
+            this.tsbReSignal.Size = new System.Drawing.Size(172, 102);
             this.tsbReSignal.Text = "重发信号";
             this.tsbReSignal.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.tsbReSignal_DropDownItemClicked);
             this.tsbReSignal.Click += new System.EventHandler(this.tsbReSignal_Click);
@@ -668,7 +692,7 @@
             this.tsbPrint.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.tsbPrint.ImageTransparentColor = System.Drawing.Color.White;
             this.tsbPrint.Name = "tsbPrint";
-            this.tsbPrint.Size = new System.Drawing.Size(142, 67);
+            this.tsbPrint.Size = new System.Drawing.Size(186, 102);
             this.tsbPrint.Text = "重打总成码";
             this.tsbPrint.Visible = false;
             this.tsbPrint.Click += new System.EventHandler(this.tsbPrint_Click);
@@ -687,7 +711,7 @@
             this.tsbOrderOperation.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.tsbOrderOperation.ImageTransparentColor = System.Drawing.Color.White;
             this.tsbOrderOperation.Name = "tsbOrderOperation";
-            this.tsbOrderOperation.Size = new System.Drawing.Size(135, 67);
+            this.tsbOrderOperation.Size = new System.Drawing.Size(176, 102);
             this.tsbOrderOperation.Text = "工单操作";
             // 
             // tsmiSuspendOrder
@@ -695,7 +719,7 @@
             this.tsmiSuspendOrder.Image = global::QMAPP.WinForm.Resource1.stop;
             this.tsmiSuspendOrder.Margin = new System.Windows.Forms.Padding(0, 7, 0, 7);
             this.tsmiSuspendOrder.Name = "tsmiSuspendOrder";
-            this.tsmiSuspendOrder.Size = new System.Drawing.Size(167, 26);
+            this.tsmiSuspendOrder.Size = new System.Drawing.Size(230, 36);
             this.tsmiSuspendOrder.Text = "挂起工单";
             this.tsmiSuspendOrder.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
             this.tsmiSuspendOrder.Click += new System.EventHandler(this.tsmiSuspendOrder_Click);
@@ -705,7 +729,7 @@
             this.tsmiCancelSuspend.Image = global::QMAPP.WinForm.Resource1.back;
             this.tsmiCancelSuspend.Margin = new System.Windows.Forms.Padding(0, 7, 0, 7);
             this.tsmiCancelSuspend.Name = "tsmiCancelSuspend";
-            this.tsmiCancelSuspend.Size = new System.Drawing.Size(167, 26);
+            this.tsmiCancelSuspend.Size = new System.Drawing.Size(230, 36);
             this.tsmiCancelSuspend.Text = "取消挂起";
             this.tsmiCancelSuspend.Click += new System.EventHandler(this.tsmiCancelSuspend_Click);
             // 
@@ -714,7 +738,7 @@
             this.tsmiResetOrder.Image = global::QMAPP.WinForm.Resource1.reload;
             this.tsmiResetOrder.Margin = new System.Windows.Forms.Padding(0, 7, 0, 7);
             this.tsmiResetOrder.Name = "tsmiResetOrder";
-            this.tsmiResetOrder.Size = new System.Drawing.Size(167, 26);
+            this.tsmiResetOrder.Size = new System.Drawing.Size(230, 36);
             this.tsmiResetOrder.Text = "重置工单";
             this.tsmiResetOrder.Click += new System.EventHandler(this.tsmiResetOrder_Click);
             // 
@@ -723,7 +747,7 @@
             this.tsmiTakebackOrder.Image = global::QMAPP.WinForm.Resource1.undo;
             this.tsmiTakebackOrder.Margin = new System.Windows.Forms.Padding(0, 7, 0, 7);
             this.tsmiTakebackOrder.Name = "tsmiTakebackOrder";
-            this.tsmiTakebackOrder.Size = new System.Drawing.Size(167, 26);
+            this.tsmiTakebackOrder.Size = new System.Drawing.Size(230, 36);
             this.tsmiTakebackOrder.Text = "收回工单";
             this.tsmiTakebackOrder.Click += new System.EventHandler(this.tsmiTakebackOrder_Click);
             // 
@@ -732,7 +756,7 @@
             this.tsmiDeleteOrder.Image = global::QMAPP.WinForm.Resource1.delete;
             this.tsmiDeleteOrder.Margin = new System.Windows.Forms.Padding(0, 7, 0, 7);
             this.tsmiDeleteOrder.Name = "tsmiDeleteOrder";
-            this.tsmiDeleteOrder.Size = new System.Drawing.Size(167, 26);
+            this.tsmiDeleteOrder.Size = new System.Drawing.Size(230, 36);
             this.tsmiDeleteOrder.Text = "删除工单";
             this.tsmiDeleteOrder.Click += new System.EventHandler(this.tsmiDeleteOrder_Click);
             // 
@@ -741,7 +765,7 @@
             this.tsmiIgnoreFISBreak.Image = global::QMAPP.WinForm.Resource1.recover;
             this.tsmiIgnoreFISBreak.Margin = new System.Windows.Forms.Padding(0, 7, 0, 7);
             this.tsmiIgnoreFISBreak.Name = "tsmiIgnoreFISBreak";
-            this.tsmiIgnoreFISBreak.Size = new System.Drawing.Size(167, 26);
+            this.tsmiIgnoreFISBreak.Size = new System.Drawing.Size(230, 36);
             this.tsmiIgnoreFISBreak.Text = "忽略FIS断号";
             this.tsmiIgnoreFISBreak.Click += new System.EventHandler(this.tsmiIgnoreFISBreak_Click);
             // 
@@ -752,7 +776,7 @@
             this.tsbAndon.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.tsbAndon.ImageTransparentColor = System.Drawing.Color.White;
             this.tsbAndon.Name = "tsbAndon";
-            this.tsbAndon.Size = new System.Drawing.Size(147, 67);
+            this.tsbAndon.Size = new System.Drawing.Size(200, 102);
             this.tsbAndon.Text = "ANDON呼叫";
             this.tsbAndon.Click += new System.EventHandler(this.tsbAndon_Click);
             // 
@@ -775,7 +799,7 @@
             this.btnSignInfo.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.btnSignInfo.ImageTransparentColor = System.Drawing.Color.White;
             this.btnSignInfo.Name = "btnSignInfo";
-            this.btnSignInfo.Size = new System.Drawing.Size(126, 67);
+            this.btnSignInfo.Size = new System.Drawing.Size(162, 102);
             this.btnSignInfo.Text = "登记信息";
             this.btnSignInfo.Click += new System.EventHandler(this.btnSignInfo_Click);
             // 
@@ -786,7 +810,7 @@
             this.btnEditProduct.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.btnEditProduct.ImageTransparentColor = System.Drawing.Color.White;
             this.btnEditProduct.Name = "btnEditProduct";
-            this.btnEditProduct.Size = new System.Drawing.Size(126, 67);
+            this.btnEditProduct.Size = new System.Drawing.Size(162, 102);
             this.btnEditProduct.Text = "产品返修";
             this.btnEditProduct.Click += new System.EventHandler(this.btnEditProduct_Click);
             // 
@@ -797,7 +821,7 @@
             this.btnRefresh.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.btnRefresh.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.btnRefresh.Name = "btnRefresh";
-            this.btnRefresh.Size = new System.Drawing.Size(62, 67);
+            this.btnRefresh.Size = new System.Drawing.Size(82, 102);
             this.btnRefresh.Text = "刷新";
             this.btnRefresh.Visible = false;
             this.btnRefresh.Click += new System.EventHandler(this.btnRefresh_Click);
@@ -808,7 +832,7 @@
             this.toolStripButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.toolStripButton1.Name = "toolStripButton1";
-            this.toolStripButton1.Size = new System.Drawing.Size(120, 67);
+            this.toolStripButton1.Size = new System.Drawing.Size(152, 102);
             this.toolStripButton1.Text = "缺陷统计卡";
             this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
             // 
@@ -830,10 +854,11 @@
             this.panel4.Controls.Add(this.plInfo);
             this.panel4.Controls.Add(this.plPlanAndRecord);
             this.panel4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panel4.Location = new System.Drawing.Point(0, 310);
+            this.panel4.Location = new System.Drawing.Point(0, 464);
+            this.panel4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.panel4.Name = "panel4";
-            this.panel4.Padding = new System.Windows.Forms.Padding(0, 3, 0, 0);
-            this.panel4.Size = new System.Drawing.Size(1698, 70);
+            this.panel4.Padding = new System.Windows.Forms.Padding(0, 4, 0, 0);
+            this.panel4.Size = new System.Drawing.Size(2524, 106);
             this.panel4.TabIndex = 21;
             // 
             // plInfo
@@ -842,10 +867,11 @@
             this.plInfo.Controls.Add(this.gbMlist);
             this.plInfo.Controls.Add(this.btnCollapse);
             this.plInfo.Dock = System.Windows.Forms.DockStyle.Right;
-            this.plInfo.Location = new System.Drawing.Point(835, 3);
+            this.plInfo.Location = new System.Drawing.Point(1230, 4);
+            this.plInfo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.plInfo.Name = "plInfo";
-            this.plInfo.Padding = new System.Windows.Forms.Padding(5);
-            this.plInfo.Size = new System.Drawing.Size(863, 67);
+            this.plInfo.Padding = new System.Windows.Forms.Padding(8, 8, 8, 8);
+            this.plInfo.Size = new System.Drawing.Size(1294, 102);
             this.plInfo.TabIndex = 1;
             this.plInfo.Visible = false;
             // 
@@ -854,9 +880,11 @@
             this.gbMlist.Controls.Add(this.dgvMlist);
             this.gbMlist.Dock = System.Windows.Forms.DockStyle.Fill;
             this.gbMlist.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.gbMlist.Location = new System.Drawing.Point(41, 5);
+            this.gbMlist.Location = new System.Drawing.Point(62, 8);
+            this.gbMlist.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gbMlist.Name = "gbMlist";
-            this.gbMlist.Size = new System.Drawing.Size(817, 57);
+            this.gbMlist.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.gbMlist.Size = new System.Drawing.Size(1224, 86);
             this.gbMlist.TabIndex = 0;
             this.gbMlist.TabStop = false;
             this.gbMlist.Text = "装配物料清单";
@@ -869,14 +897,15 @@
             this.dgcMListMaterialCode,
             this.dgcMListQty});
             this.dgvMlist.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.dgvMlist.Location = new System.Drawing.Point(3, 28);
+            this.dgvMlist.Location = new System.Drawing.Point(4, 41);
+            this.dgvMlist.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.dgvMlist.Name = "dgvMlist";
             this.dgvMlist.ReadOnly = true;
             this.dgvMlist.RowHeadersVisible = false;
             this.dgvMlist.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("微软雅黑", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dgvMlist.RowTemplate.Height = 35;
             this.dgvMlist.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvMlist.Size = new System.Drawing.Size(811, 26);
+            this.dgvMlist.Size = new System.Drawing.Size(1216, 41);
             this.dgvMlist.TabIndex = 0;
             // 
             // dgcMListMaterialName
@@ -886,7 +915,7 @@
             this.dgcMListMaterialName.HeaderText = "物料名称";
             this.dgcMListMaterialName.Name = "dgcMListMaterialName";
             this.dgcMListMaterialName.ReadOnly = true;
-            this.dgcMListMaterialName.Width = 113;
+            this.dgcMListMaterialName.Width = 165;
             // 
             // dgcMListMaterialCode
             // 
@@ -895,7 +924,7 @@
             this.dgcMListMaterialCode.HeaderText = "物料号";
             this.dgcMListMaterialCode.Name = "dgcMListMaterialCode";
             this.dgcMListMaterialCode.ReadOnly = true;
-            this.dgcMListMaterialCode.Width = 94;
+            this.dgcMListMaterialCode.Width = 137;
             // 
             // dgcMListQty
             // 
@@ -904,15 +933,16 @@
             this.dgcMListQty.HeaderText = "数量";
             this.dgcMListQty.Name = "dgcMListQty";
             this.dgcMListQty.ReadOnly = true;
-            this.dgcMListQty.Width = 75;
+            this.dgcMListQty.Width = 109;
             // 
             // btnCollapse
             // 
             this.btnCollapse.Dock = System.Windows.Forms.DockStyle.Left;
             this.btnCollapse.Image = global::QMAPP.WinForm.Resource1.back;
-            this.btnCollapse.Location = new System.Drawing.Point(5, 5);
+            this.btnCollapse.Location = new System.Drawing.Point(8, 8);
+            this.btnCollapse.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnCollapse.Name = "btnCollapse";
-            this.btnCollapse.Size = new System.Drawing.Size(36, 57);
+            this.btnCollapse.Size = new System.Drawing.Size(54, 86);
             this.btnCollapse.TabIndex = 1;
             this.btnCollapse.UseVisualStyleBackColor = true;
             this.btnCollapse.Click += new System.EventHandler(this.btnCollapse_Click);
@@ -927,9 +957,10 @@
             this.plPlanAndRecord.Controls.Add(this.label6);
             this.plPlanAndRecord.Controls.Add(this.tabView);
             this.plPlanAndRecord.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.plPlanAndRecord.Location = new System.Drawing.Point(0, 3);
+            this.plPlanAndRecord.Location = new System.Drawing.Point(0, 4);
+            this.plPlanAndRecord.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.plPlanAndRecord.Name = "plPlanAndRecord";
-            this.plPlanAndRecord.Size = new System.Drawing.Size(1698, 67);
+            this.plPlanAndRecord.Size = new System.Drawing.Size(2524, 102);
             this.plPlanAndRecord.TabIndex = 0;
             // 
             // cbPlanFilter
@@ -942,18 +973,20 @@
             "显示全部工单",
             "隐藏挂起工单",
             "只看挂起工单"});
-            this.cbPlanFilter.Location = new System.Drawing.Point(1230, 1);
+            this.cbPlanFilter.Location = new System.Drawing.Point(1822, 2);
+            this.cbPlanFilter.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.cbPlanFilter.Name = "cbPlanFilter";
-            this.cbPlanFilter.Size = new System.Drawing.Size(143, 33);
+            this.cbPlanFilter.Size = new System.Drawing.Size(212, 44);
             this.cbPlanFilter.TabIndex = 17;
             // 
             // label10
             // 
             this.label10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.label10.AutoSize = true;
-            this.label10.Location = new System.Drawing.Point(1172, 11);
+            this.label10.Location = new System.Drawing.Point(1735, 16);
+            this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(53, 12);
+            this.label10.Size = new System.Drawing.Size(80, 18);
             this.label10.TabIndex = 16;
             this.label10.Text = "工单过滤";
             // 
@@ -969,9 +1002,10 @@
             "40",
             "50",
             "100"});
-            this.cbListRowcount.Location = new System.Drawing.Point(1460, 1);
+            this.cbListRowcount.Location = new System.Drawing.Point(2167, 2);
+            this.cbListRowcount.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.cbListRowcount.Name = "cbListRowcount";
-            this.cbListRowcount.Size = new System.Drawing.Size(78, 33);
+            this.cbListRowcount.Size = new System.Drawing.Size(115, 44);
             this.cbListRowcount.TabIndex = 15;
             // 
             // cbRefreshRate
@@ -987,18 +1021,20 @@
             "10s",
             "15s",
             "20s"});
-            this.cbRefreshRate.Location = new System.Drawing.Point(1625, 1);
+            this.cbRefreshRate.Location = new System.Drawing.Point(2415, 2);
+            this.cbRefreshRate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.cbRefreshRate.Name = "cbRefreshRate";
-            this.cbRefreshRate.Size = new System.Drawing.Size(66, 33);
+            this.cbRefreshRate.Size = new System.Drawing.Size(97, 44);
             this.cbRefreshRate.TabIndex = 14;
             // 
             // label8
             // 
             this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(1378, 11);
+            this.label8.Location = new System.Drawing.Point(2044, 16);
+            this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(77, 12);
+            this.label8.Size = new System.Drawing.Size(116, 18);
             this.label8.TabIndex = 12;
             this.label8.Text = "列表显示行数";
             // 
@@ -1006,9 +1042,10 @@
             // 
             this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(1543, 11);
+            this.label6.Location = new System.Drawing.Point(2291, 16);
+            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(77, 12);
+            this.label6.Size = new System.Drawing.Size(116, 18);
             this.label6.TabIndex = 13;
             this.label6.Text = "计划刷新频率";
             // 
@@ -1020,9 +1057,10 @@
             this.tabView.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.tabView.ItemSize = new System.Drawing.Size(120, 32);
             this.tabView.Location = new System.Drawing.Point(0, 0);
+            this.tabView.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tabView.Name = "tabView";
             this.tabView.SelectedIndex = 0;
-            this.tabView.Size = new System.Drawing.Size(1698, 67);
+            this.tabView.Size = new System.Drawing.Size(2524, 102);
             this.tabView.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
             this.tabView.TabIndex = 11;
             // 
@@ -1031,8 +1069,9 @@
             this.tpPlan.Controls.Add(this.dgvPlan);
             this.tpPlan.Controls.Add(this.tlpPlanCount);
             this.tpPlan.Location = new System.Drawing.Point(4, 36);
+            this.tpPlan.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tpPlan.Name = "tpPlan";
-            this.tpPlan.Size = new System.Drawing.Size(1690, 27);
+            this.tpPlan.Size = new System.Drawing.Size(2516, 62);
             this.tpPlan.TabIndex = 0;
             this.tpPlan.Text = "生产计划";
             this.tpPlan.UseVisualStyleBackColor = true;
@@ -1043,14 +1082,14 @@
             this.dgvPlan.AllowUserToDeleteRows = false;
             this.dgvPlan.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells;
             this.dgvPlan.BackgroundColor = System.Drawing.SystemColors.ButtonFace;
-            dataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle43.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle43.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle43.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle43.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle43.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle43.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvPlan.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle43;
+            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle13.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvPlan.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle13;
             this.dgvPlan.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dgvPlan.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.dgcOrderNo,
@@ -1066,21 +1105,22 @@
             this.dataGridViewTextBoxColumn11});
             this.dgvPlan.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvPlan.Location = new System.Drawing.Point(0, 0);
+            this.dgvPlan.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.dgvPlan.Name = "dgvPlan";
             this.dgvPlan.ReadOnly = true;
-            dataGridViewCellStyle51.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle51.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle51.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle51.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle51.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle51.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle51.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dgvPlan.RowHeadersDefaultCellStyle = dataGridViewCellStyle51;
-            dataGridViewCellStyle52.Padding = new System.Windows.Forms.Padding(0, 0, 8, 0);
-            this.dgvPlan.RowsDefaultCellStyle = dataGridViewCellStyle52;
+            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle21.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvPlan.RowHeadersDefaultCellStyle = dataGridViewCellStyle21;
+            dataGridViewCellStyle22.Padding = new System.Windows.Forms.Padding(0, 0, 8, 0);
+            this.dgvPlan.RowsDefaultCellStyle = dataGridViewCellStyle22;
             this.dgvPlan.RowTemplate.Height = 23;
             this.dgvPlan.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvPlan.Size = new System.Drawing.Size(1525, 27);
+            this.dgvPlan.Size = new System.Drawing.Size(2268, 62);
             this.dgvPlan.TabIndex = 6;
             this.dgvPlan.RowPrePaint += new System.Windows.Forms.DataGridViewRowPrePaintEventHandler(this.dgvPlan_RowPrePaint);
             this.dgvPlan.SelectionChanged += new System.EventHandler(this.dgvPlan_SelectionChanged);
@@ -1088,72 +1128,72 @@
             // dgcOrderNo
             // 
             this.dgcOrderNo.DataPropertyName = "ORDERPLAN_NO";
-            dataGridViewCellStyle44.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dgcOrderNo.DefaultCellStyle = dataGridViewCellStyle44;
+            dataGridViewCellStyle14.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgcOrderNo.DefaultCellStyle = dataGridViewCellStyle14;
             this.dgcOrderNo.HeaderText = "订单号";
             this.dgcOrderNo.Name = "dgcOrderNo";
             this.dgcOrderNo.ReadOnly = true;
-            this.dgcOrderNo.Width = 84;
+            this.dgcOrderNo.Width = 121;
             // 
             // dgcSeq
             // 
             this.dgcSeq.DataPropertyName = "SEQ";
-            dataGridViewCellStyle45.Font = new System.Drawing.Font("宋体", 15.75F);
-            this.dgcSeq.DefaultCellStyle = dataGridViewCellStyle45;
+            dataGridViewCellStyle15.Font = new System.Drawing.Font("宋体", 15.75F);
+            this.dgcSeq.DefaultCellStyle = dataGridViewCellStyle15;
             this.dgcSeq.HeaderText = "顺序号";
             this.dgcSeq.Name = "dgcSeq";
             this.dgcSeq.ReadOnly = true;
-            this.dgcSeq.Width = 84;
+            this.dgcSeq.Width = 121;
             // 
             // dgcMaterialCode
             // 
             this.dgcMaterialCode.DataPropertyName = "MATERIAL_CODE";
-            dataGridViewCellStyle46.Font = new System.Drawing.Font("宋体", 15.75F);
-            this.dgcMaterialCode.DefaultCellStyle = dataGridViewCellStyle46;
+            dataGridViewCellStyle16.Font = new System.Drawing.Font("宋体", 15.75F);
+            this.dgcMaterialCode.DefaultCellStyle = dataGridViewCellStyle16;
             this.dgcMaterialCode.HeaderText = "零件号";
             this.dgcMaterialCode.Name = "dgcMaterialCode";
             this.dgcMaterialCode.ReadOnly = true;
-            this.dgcMaterialCode.Width = 84;
+            this.dgcMaterialCode.Width = 121;
             // 
             // dgcMaterialName
             // 
             this.dgcMaterialName.DataPropertyName = "MATERIAL_NAME";
-            dataGridViewCellStyle47.Font = new System.Drawing.Font("宋体", 15.75F);
-            this.dgcMaterialName.DefaultCellStyle = dataGridViewCellStyle47;
+            dataGridViewCellStyle17.Font = new System.Drawing.Font("宋体", 15.75F);
+            this.dgcMaterialName.DefaultCellStyle = dataGridViewCellStyle17;
             this.dgcMaterialName.HeaderText = "零件描述";
             this.dgcMaterialName.Name = "dgcMaterialName";
             this.dgcMaterialName.ReadOnly = true;
-            this.dgcMaterialName.Width = 101;
+            this.dgcMaterialName.Width = 146;
             // 
             // dgcState
             // 
-            dataGridViewCellStyle48.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dgcState.DefaultCellStyle = dataGridViewCellStyle48;
+            dataGridViewCellStyle18.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dgcState.DefaultCellStyle = dataGridViewCellStyle18;
             this.dgcState.HeaderText = "工单状态";
             this.dgcState.MinimumWidth = 80;
             this.dgcState.Name = "dgcState";
             this.dgcState.ReadOnly = true;
-            this.dgcState.Width = 101;
+            this.dgcState.Width = 146;
             // 
             // dgcPlanDate
             // 
             this.dgcPlanDate.DataPropertyName = "PLAN_DATE";
-            dataGridViewCellStyle49.Font = new System.Drawing.Font("宋体", 15.75F);
-            this.dgcPlanDate.DefaultCellStyle = dataGridViewCellStyle49;
+            dataGridViewCellStyle19.Font = new System.Drawing.Font("宋体", 15.75F);
+            this.dgcPlanDate.DefaultCellStyle = dataGridViewCellStyle19;
             this.dgcPlanDate.HeaderText = "计划日期";
             this.dgcPlanDate.Name = "dgcPlanDate";
             this.dgcPlanDate.ReadOnly = true;
-            this.dgcPlanDate.Width = 101;
+            this.dgcPlanDate.Width = 146;
             // 
             // dgcShift
             // 
             this.dgcShift.DataPropertyName = "SHIFT_CODE";
-            dataGridViewCellStyle50.Font = new System.Drawing.Font("宋体", 15.75F);
-            this.dgcShift.DefaultCellStyle = dataGridViewCellStyle50;
+            dataGridViewCellStyle20.Font = new System.Drawing.Font("宋体", 15.75F);
+            this.dgcShift.DefaultCellStyle = dataGridViewCellStyle20;
             this.dgcShift.HeaderText = "班次";
             this.dgcShift.Name = "dgcShift";
             this.dgcShift.ReadOnly = true;
-            this.dgcShift.Width = 67;
+            this.dgcShift.Width = 96;
             // 
             // dataGridViewTextBoxColumn8
             // 
@@ -1205,7 +1245,8 @@
             this.tlpPlanCount.Controls.Add(this.label5, 0, 4);
             this.tlpPlanCount.Controls.Add(this.label4, 0, 2);
             this.tlpPlanCount.Dock = System.Windows.Forms.DockStyle.Right;
-            this.tlpPlanCount.Location = new System.Drawing.Point(1525, 0);
+            this.tlpPlanCount.Location = new System.Drawing.Point(2268, 0);
+            this.tlpPlanCount.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tlpPlanCount.Name = "tlpPlanCount";
             this.tlpPlanCount.RowCount = 8;
             this.tlpPlanCount.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 9.774436F));
@@ -1216,7 +1257,7 @@
             this.tlpPlanCount.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 15.03759F));
             this.tlpPlanCount.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 9.774436F));
             this.tlpPlanCount.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 15.78947F));
-            this.tlpPlanCount.Size = new System.Drawing.Size(165, 27);
+            this.tlpPlanCount.Size = new System.Drawing.Size(248, 62);
             this.tlpPlanCount.TabIndex = 4;
             // 
             // lblDayPlanCount
@@ -1224,9 +1265,10 @@
             this.lblDayPlanCount.AutoSize = true;
             this.lblDayPlanCount.Dock = System.Windows.Forms.DockStyle.Fill;
             this.lblDayPlanCount.Font = new System.Drawing.Font("微软雅黑", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblDayPlanCount.Location = new System.Drawing.Point(3, 2);
+            this.lblDayPlanCount.Location = new System.Drawing.Point(4, 6);
+            this.lblDayPlanCount.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblDayPlanCount.Name = "lblDayPlanCount";
-            this.lblDayPlanCount.Size = new System.Drawing.Size(159, 4);
+            this.lblDayPlanCount.Size = new System.Drawing.Size(240, 9);
             this.lblDayPlanCount.TabIndex = 8;
             this.lblDayPlanCount.Text = "0";
             this.lblDayPlanCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1235,9 +1277,10 @@
             // 
             this.label11.AutoSize = true;
             this.label11.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.label11.Location = new System.Drawing.Point(3, 0);
+            this.label11.Location = new System.Drawing.Point(4, 0);
+            this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label11.Name = "label11";
-            this.label11.Size = new System.Drawing.Size(159, 2);
+            this.label11.Size = new System.Drawing.Size(240, 6);
             this.label11.TabIndex = 7;
             this.label11.Text = "当日计划总数量";
             // 
@@ -1246,9 +1289,10 @@
             this.lblShiftCompleteCount.AutoSize = true;
             this.lblShiftCompleteCount.Dock = System.Windows.Forms.DockStyle.Fill;
             this.lblShiftCompleteCount.Font = new System.Drawing.Font("微软雅黑", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblShiftCompleteCount.Location = new System.Drawing.Point(3, 20);
+            this.lblShiftCompleteCount.Location = new System.Drawing.Point(4, 51);
+            this.lblShiftCompleteCount.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblShiftCompleteCount.Name = "lblShiftCompleteCount";
-            this.lblShiftCompleteCount.Size = new System.Drawing.Size(159, 7);
+            this.lblShiftCompleteCount.Size = new System.Drawing.Size(240, 11);
             this.lblShiftCompleteCount.TabIndex = 6;
             this.lblShiftCompleteCount.Text = "0";
             this.lblShiftCompleteCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1258,9 +1302,10 @@
             this.lblShiftPlanCount.AutoSize = true;
             this.lblShiftPlanCount.Dock = System.Windows.Forms.DockStyle.Fill;
             this.lblShiftPlanCount.Font = new System.Drawing.Font("微软雅黑", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblShiftPlanCount.Location = new System.Drawing.Point(3, 14);
+            this.lblShiftPlanCount.Location = new System.Drawing.Point(4, 36);
+            this.lblShiftPlanCount.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblShiftPlanCount.Name = "lblShiftPlanCount";
-            this.lblShiftPlanCount.Size = new System.Drawing.Size(159, 4);
+            this.lblShiftPlanCount.Size = new System.Drawing.Size(240, 9);
             this.lblShiftPlanCount.TabIndex = 5;
             this.lblShiftPlanCount.Text = "0";
             this.lblShiftPlanCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1270,9 +1315,10 @@
             this.lblPlanCount.AutoSize = true;
             this.lblPlanCount.Dock = System.Windows.Forms.DockStyle.Fill;
             this.lblPlanCount.Font = new System.Drawing.Font("微软雅黑", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblPlanCount.Location = new System.Drawing.Point(3, 8);
+            this.lblPlanCount.Location = new System.Drawing.Point(4, 21);
+            this.lblPlanCount.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblPlanCount.Name = "lblPlanCount";
-            this.lblPlanCount.Size = new System.Drawing.Size(159, 4);
+            this.lblPlanCount.Size = new System.Drawing.Size(240, 9);
             this.lblPlanCount.TabIndex = 4;
             this.lblPlanCount.Text = "0";
             this.lblPlanCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1281,9 +1327,10 @@
             // 
             this.label7.AutoSize = true;
             this.label7.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.label7.Location = new System.Drawing.Point(3, 18);
+            this.label7.Location = new System.Drawing.Point(4, 45);
+            this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(159, 2);
+            this.label7.Size = new System.Drawing.Size(240, 6);
             this.label7.TabIndex = 2;
             this.label7.Text = "本班次已完成数量";
             // 
@@ -1291,9 +1338,10 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.label5.Location = new System.Drawing.Point(3, 12);
+            this.label5.Location = new System.Drawing.Point(4, 30);
+            this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(159, 2);
+            this.label5.Size = new System.Drawing.Size(240, 6);
             this.label5.TabIndex = 1;
             this.label5.Text = "本班次待完成数量";
             // 
@@ -1301,9 +1349,10 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.label4.Location = new System.Drawing.Point(3, 6);
+            this.label4.Location = new System.Drawing.Point(4, 15);
+            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(159, 2);
+            this.label4.Size = new System.Drawing.Size(240, 6);
             this.label4.TabIndex = 0;
             this.label4.Text = "待完成计划数量";
             // 
@@ -1311,8 +1360,9 @@
             // 
             this.tpRecord.Controls.Add(this.DGViewProList);
             this.tpRecord.Location = new System.Drawing.Point(4, 36);
+            this.tpRecord.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tpRecord.Name = "tpRecord";
-            this.tpRecord.Size = new System.Drawing.Size(1690, 27);
+            this.tpRecord.Size = new System.Drawing.Size(2539, 60);
             this.tpRecord.TabIndex = 1;
             this.tpRecord.Text = "加工记录";
             this.tpRecord.UseVisualStyleBackColor = true;
@@ -1323,14 +1373,14 @@
             this.DGViewProList.AllowUserToDeleteRows = false;
             this.DGViewProList.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
             this.DGViewProList.BackgroundColor = System.Drawing.SystemColors.ButtonFace;
-            dataGridViewCellStyle53.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle53.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle53.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle53.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle53.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle53.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle53.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.DGViewProList.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle53;
+            dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle23.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.DGViewProList.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle23;
             this.DGViewProList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.DGViewProList.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.PRODUCTCODE,
@@ -1345,19 +1395,20 @@
             this.OPERATESTATE});
             this.DGViewProList.Dock = System.Windows.Forms.DockStyle.Fill;
             this.DGViewProList.Location = new System.Drawing.Point(0, 0);
+            this.DGViewProList.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.DGViewProList.Name = "DGViewProList";
             this.DGViewProList.ReadOnly = true;
-            dataGridViewCellStyle60.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle60.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle60.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle60.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle60.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle60.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle60.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.DGViewProList.RowHeadersDefaultCellStyle = dataGridViewCellStyle60;
+            dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle30.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle30.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle30.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle30.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle30.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.DGViewProList.RowHeadersDefaultCellStyle = dataGridViewCellStyle30;
             this.DGViewProList.RowTemplate.Height = 23;
             this.DGViewProList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.DGViewProList.Size = new System.Drawing.Size(1690, 27);
+            this.DGViewProList.Size = new System.Drawing.Size(2539, 60);
             this.DGViewProList.TabIndex = 5;
             this.DGViewProList.RowPrePaint += new System.Windows.Forms.DataGridViewRowPrePaintEventHandler(this.DGViewProList_RowPrePaint);
             // 
@@ -1365,8 +1416,8 @@
             // 
             this.PRODUCTCODE.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.PRODUCTCODE.DataPropertyName = "PRODUCTCODE";
-            dataGridViewCellStyle54.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PRODUCTCODE.DefaultCellStyle = dataGridViewCellStyle54;
+            dataGridViewCellStyle24.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.PRODUCTCODE.DefaultCellStyle = dataGridViewCellStyle24;
             this.PRODUCTCODE.FillWeight = 29.82234F;
             this.PRODUCTCODE.HeaderText = "条码";
             this.PRODUCTCODE.Name = "PRODUCTCODE";
@@ -1377,8 +1428,8 @@
             // 
             this.PRODUCTCODESTR.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.PRODUCTCODESTR.DataPropertyName = "PRODUCTCODESTR";
-            dataGridViewCellStyle55.Font = new System.Drawing.Font("宋体", 15.75F);
-            this.PRODUCTCODESTR.DefaultCellStyle = dataGridViewCellStyle55;
+            dataGridViewCellStyle25.Font = new System.Drawing.Font("宋体", 15.75F);
+            this.PRODUCTCODESTR.DefaultCellStyle = dataGridViewCellStyle25;
             this.PRODUCTCODESTR.HeaderText = "骨架条码";
             this.PRODUCTCODESTR.Name = "PRODUCTCODESTR";
             this.PRODUCTCODESTR.ReadOnly = true;
@@ -1389,8 +1440,8 @@
             // 
             this.MOLDNUMBER.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.MOLDNUMBER.DataPropertyName = "MOLDNUMBER";
-            dataGridViewCellStyle56.Font = new System.Drawing.Font("宋体", 15.75F);
-            this.MOLDNUMBER.DefaultCellStyle = dataGridViewCellStyle56;
+            dataGridViewCellStyle26.Font = new System.Drawing.Font("宋体", 15.75F);
+            this.MOLDNUMBER.DefaultCellStyle = dataGridViewCellStyle26;
             this.MOLDNUMBER.FillWeight = 380.7106F;
             this.MOLDNUMBER.HeaderText = "模架号";
             this.MOLDNUMBER.Name = "MOLDNUMBER";
@@ -1401,8 +1452,8 @@
             // 
             this.dataGridViewTextBoxColumn2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.dataGridViewTextBoxColumn2.DataPropertyName = "OPERATESTATETEXT";
-            dataGridViewCellStyle57.Font = new System.Drawing.Font("宋体", 15.75F);
-            this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle57;
+            dataGridViewCellStyle27.Font = new System.Drawing.Font("宋体", 15.75F);
+            this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle27;
             this.dataGridViewTextBoxColumn2.FillWeight = 29.82234F;
             this.dataGridViewTextBoxColumn2.HeaderText = "加工状态";
             this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
@@ -1413,8 +1464,8 @@
             // 
             this.Column5.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.Column5.DataPropertyName = "CREATEDATE";
-            dataGridViewCellStyle58.Font = new System.Drawing.Font("宋体", 15.75F);
-            this.Column5.DefaultCellStyle = dataGridViewCellStyle58;
+            dataGridViewCellStyle28.Font = new System.Drawing.Font("宋体", 15.75F);
+            this.Column5.DefaultCellStyle = dataGridViewCellStyle28;
             this.Column5.FillWeight = 29.82234F;
             this.Column5.HeaderText = "加工时间";
             this.Column5.Name = "Column5";
@@ -1425,8 +1476,8 @@
             // 
             this.OPERATEDDATE.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.OPERATEDDATE.DataPropertyName = "OPERATEDDATE";
-            dataGridViewCellStyle59.Font = new System.Drawing.Font("宋体", 15.75F);
-            this.OPERATEDDATE.DefaultCellStyle = dataGridViewCellStyle59;
+            dataGridViewCellStyle29.Font = new System.Drawing.Font("宋体", 15.75F);
+            this.OPERATEDDATE.DefaultCellStyle = dataGridViewCellStyle29;
             this.OPERATEDDATE.FillWeight = 29.82234F;
             this.OPERATEDDATE.HeaderText = "加工完成时间";
             this.OPERATEDDATE.Name = "OPERATEDDATE";
@@ -1471,16 +1522,27 @@
             this.timer1.Interval = 1000;
             this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
             // 
+            // txtGlue
+            // 
+            this.txtGlue.AutoSize = true;
+            this.txtGlue.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtGlue.Location = new System.Drawing.Point(1862, 36);
+            this.txtGlue.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.txtGlue.Name = "txtGlue";
+            this.txtGlue.Size = new System.Drawing.Size(0, 30);
+            this.txtGlue.TabIndex = 14;
+            // 
             // OperationForm
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1698, 450);
+            this.ClientSize = new System.Drawing.Size(2524, 675);
             this.Controls.Add(this.panel4);
             this.Controls.Add(this.toolStrip1);
             this.Controls.Add(this.plDAI);
             this.Controls.Add(this.panelSearch);
             this.Controls.Add(this.panel2);
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "OperationForm";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "加工操作";
@@ -1617,5 +1679,6 @@
         private System.Windows.Forms.TextBox tBMat;
         private System.Windows.Forms.ToolStripButton btnSignInfo;
         private System.Windows.Forms.ToolStripButton toolStripButton3;
+        private System.Windows.Forms.Label txtGlue;
     }
 }
\ No newline at end of file
diff --git a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs
index cf8e8c5..e7925f4 100644
--- a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs
+++ b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs
@@ -29,6 +29,7 @@ using QMAPP.FJC.Entity.ProductionPlan;
 using gregn6Lib;
 using System.Data;
 using QMAPP.FJC.Entity.BZD;
+using QMAPP.FJC.Entity.MD;
 
 namespace QMAPP.WinForm.Forms.Operation
 {
@@ -109,6 +110,9 @@ namespace QMAPP.WinForm.Forms.Operation
         private string _DeleteProductLoc = string.Empty;  //撤销按钮删除产品信息触发工位
         private string _DeleteProductDaiCode = string.Empty; //撤销按钮删除产品信息触发采集点
 
+        private string[] _scanGlueLocs = null;// 扫描混胶时间工位列表  --喷胶工位.
+        private string _glueTime = null;//       混胶时间              --喷胶工位.
+
         /// <summary>
         /// 
         /// </summary>
@@ -142,6 +146,10 @@ namespace QMAPP.WinForm.Forms.Operation
             _DeleteProductLoc = GetAppConfigValue("DeleteProductLoc");
             _DeleteProductDaiCode = GetAppConfigValue("DeleteProductDaiCode");
 
+            string scanGlues = System.Configuration.ConfigurationManager.AppSettings["喷胶验证混胶时间工位"]?.Trim();
+            _scanGlueLocs = scanGlues?.Split(';') ?? new string[] { };
+            _glueTime = GetAppConfigValue("Gluetime");
+
             this.WindowState = FormWindowState.Maximized;
             //this.CheckFile();
             okSoundPath = System.Configuration.ConfigurationManager.AppSettings["SaveFilePath"] + "Sound\\" + PlaySoundConst.strSoundOk;
@@ -675,6 +683,61 @@ namespace QMAPP.WinForm.Forms.Operation
 
                 #endregion
 
+                #region DQZhang 喷胶工位验证混胶时间 20220309
+
+                //喷胶验证混胶时间工位
+                if (_scanGlueLocs.Length > 0 && _scanGlueLocs.Contains(_operationServiceParam.machineInfo.WORKLOC_CODE))
+                {
+                    //验证是否经过手动喷胶工位扫码.
+                    if (System.Text.RegularExpressions.Regex.IsMatch(productCode, "^>CMD:GLUETIME"))
+                    {
+                        if (MessageBox.Show($"确认胶水时间切换到{System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}时间?", "提示", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
+                        {
+                            return;
+                        }
+
+                        //DateTime gluetime = System.DateTime.Now;
+                        //txtCfg.Text = "胶水时间:" + gluetime;
+
+                        txtGlue.Text = System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+
+                        UpdateAppConfigValue("Gluetime", System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+
+                        txtGlue.Visible = true;
+                        //txtGlue0.Visible = true;
+                        txtCode.Text = "";
+                        txtCode.Focus();
+                        return;
+                    }
+
+
+                    if (txtGlue.Text.Length < 1)
+                    {
+                        this.lblError.Text = "无混胶记录!";
+                        this.lblError.ForeColor = Color.Red;
+                        txtCode.SelectAll();
+                        txtCode.Focus();
+                        return;
+                    }
+                    else
+                    {
+                        //验证混胶时间
+                        DateTime PlacingDateTime = Convert.ToDateTime(txtGlue.Text);
+                        string PlacingTime = System.Configuration.ConfigurationManager.AppSettings["混胶时间"];
+                        var timespan = (DateTime.Now - Convert.ToDateTime(PlacingDateTime)).TotalHours;
+                        if (!string.IsNullOrEmpty(PlacingTime) && timespan > int.Parse(PlacingTime))
+                        {
+                            this.lblError.Text = "混胶使用时间大于 < " + PlacingTime + "> 小时";
+                            this.lblError.ForeColor = Color.Red;
+                            txtCode.SelectAll();
+                            txtCode.Focus();
+                            return;
+                        }
+                    }
+                    //return;
+                }
+                #endregion
+
                 #region 条码格式解析
 
                 var dai = LocateDAI(productCode);
@@ -702,9 +765,12 @@ namespace QMAPP.WinForm.Forms.Operation
                 this.lblError.BackColor = SystemColors.InactiveBorder;
                 #endregion
 
+                
+
                 object davalue = productCode;
                 //if(string.IsNullOrEmpty(_cfgAutoProduct))
                 //    _cfgAutoProduct = productCode;
+
                 //采集点输入
                 var result = _agent.InvokeServiceFunction<DAResult>(B9IPCService.DAI_Input.ToString()
                                                                    , new DAArgs
@@ -720,6 +786,7 @@ namespace QMAPP.WinForm.Forms.Operation
                                                                        MouldCode = string.Equals(dai.DIVBY_MOULD, "0") ? _operationServiceParam.machineInfo.WORKCELL_CODE : (string.IsNullOrWhiteSpace(lblMould.Text) ? _operationServiceParam.machineInfo.WORKCELL_CODE : lblMould.Text),
                                                                        AttachData = AttachInfo
                                                                    });
+                
                 var daiview = daicache.FirstOrDefault(p => p.DACode == dai.DA_CODE && (string.IsNullOrWhiteSpace(p.MouldCode) || p.MouldCode == (result.PreInput ? "PRE-" + result.MouldCode : result.MouldCode)));
                 if (result.PreInput)
                 {
@@ -1281,6 +1348,12 @@ namespace QMAPP.WinForm.Forms.Operation
                             PrintProcessLabel(result.ProcessCode);
                             break;
                         }
+                    case "PRINT_BFPROCESS": //状态变化动作为 打印过程码(包覆分总成打印)
+                        {
+                            //TODO:清空界面数据 复位启动信号
+                            PrintBFProcessLabel(result.ProcessCode);
+                            break;
+                        }
                     case "PRINT_PLAN": //状态变化动作为 打印计划标签
                         {
                             //TODO:清空界面数据 复位启动信号
@@ -2086,7 +2159,119 @@ namespace QMAPP.WinForm.Forms.Operation
 
             #endregion
         }
-        #endregion 
+        #endregion
+
+        #region 包覆分总成打印
+        private void PrintBFProcessLabel(string processcode)
+        {
+            string selectKey = processcode;
+            List<Product> list_product = _agent.InvokeServiceFunction<List<Product>>(B9IPCService.ProductBLL_GetListpro.ToString(), new Product() { PRODUCTCODE = selectKey });
+            if (list_product.Count == 0)
+            {
+                MessageBox.Show("获取产品信息异常!");
+                return;
+            }
+            var product = new Product();
+            foreach (var item in list_product)
+            {
+                if (item.MACHINECODDE == _operationServiceParam.machineInfo.MACHINECODDE)
+                {
+                    product = item;
+                }
+            }
+            Material materialInfo = new Material();
+            materialInfo.MATERIAL_CODE = product.MATERIAL_CODE;
+            materialInfo.MATERIAL_NAME = product.MATERIAL_NAME;
+            DataResult<List<FJC.Entity.Operation.PrintCode>> resultList = _agent.InvokeServiceFunction<DataResult<List<FJC.Entity.Operation.PrintCode>>>("MainOperationBLL_GetPrintCodeForMP4", materialInfo);
+            
+            try
+            {
+                Print(resultList.Result, true);
+            }
+            catch (Exception e)
+            {
+                var ss = e.Message;
+            }
+            
+        }
+
+        private void Print(List<FJC.Entity.Operation.PrintCode> codeList, bool IsManual)
+        {
+            List<PrintTemplate.InjectLabel> labels = new List<PrintTemplate.InjectLabel>();
+            //打印条码
+
+            string typeTem = "";
+            string typeData = "";
+            foreach (FJC.Entity.Operation.PrintCode item in codeList)
+            {
+                
+               
+                //班次信息
+                string shiftCode = ClientContext.produceShift.PRODUCESHIFTTCODE;
+                item.ShiftCode = shiftCode;
+                
+                typeTem = item.PRINT_TEMPALTE_TEM;
+                typeData = item.PRINT_TEMPALTE_DATA;
+                PrintTemplate.InjectLabel label = new PrintTemplate.InjectLabel
+                {
+                    CreateDate = DateTime.Now,
+                    //MachineCode = comMachine.SelectedValue + "",
+                    MaterialCode = item.PRODUCTCODE,
+                    MaterialName = item.MATERIAL_NAME,
+                    ModelCode = cbMould.SelectedValue + "",
+                    SerialNumber = item.MAINCODE,
+                    ShiftCode = shiftCode,
+                    IsManualPrint = IsManual
+                };
+                labels.Add(label);
+            }
+            string path = System.Configuration.ConfigurationManager.AppSettings["Template_Local_Path"];
+            if (!System.IO.Directory.Exists(path))
+            {
+                System.IO.Directory.CreateDirectory(path);
+            }
+            FastReport.Report fr = new FastReport.Report();
+            fr.RegisterData(labels, "Labels");
+            if (!System.IO.File.Exists(string.Format("{0}\\{1}.frx", path, typeTem)))
+            {
+                if (System.IO.File.Exists(string.Format("PrintTemplate\\{1}.frx", path, typeTem)))
+                {
+                    System.IO.File.Copy(string.Format("PrintTemplate\\{1}.frx", path, typeTem)
+                        , string.Format("{0}\\{1}.frx", path, typeTem));
+                }
+                else
+                {
+                    fr.FileName = string.Format("{0}\\{1}.frx", path, typeTem);
+                    fr.Design(true);
+                    fr.Save(string.Format("{0}\\{1}.frx", path, typeTem));
+                }
+            }
+            fr.Load(string.Format("{0}\\{1}.frx", path, typeTem));
+
+
+            try
+            {
+                fr.PrintSettings.ShowDialog = false;
+                fr.Print();
+            }
+            catch (Exception e)
+            {
+                var ss = e.Message;
+            }
+
+            try
+            {
+                fr.Dispose();
+            }
+            catch (Exception e)
+            {
+                var ss = e.Message;
+            }
+            
+        }
+
+
+        #endregion
 
         #region 计划标签打印
         /// <summary>
@@ -3626,6 +3811,16 @@ namespace QMAPP.WinForm.Forms.Operation
             else
                 return null;
         }
+        /// <summary>
+        /// 更新配置表
+        /// </summary>
+        /// <returns></returns>
+        public int UpdateAppConfigValue(string pConfigCode, string pConfigValue)
+        {
+            var result = _agent.InvokeServiceFunction<DataResult<int>>(B9IPCService.AppConfigBLL_UpdateAppConfig.ToString(), pConfigCode, pConfigValue);
+
+            return result.Result;
+        }
 
         /// <summary>
         /// 查找PbomItem
diff --git a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.resx b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.resx
index e52e3a1..d5e1ac0 100644
--- a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.resx
+++ b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.resx
@@ -154,7 +154,7 @@
   <data name="tsbCancel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAA0DSURBVGhDzZlZbFx3FcZDSouKkNgEQiCEWISoWglRChUC
+        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAA0DSURBVGhDzZlZbFx3FcZDSouKkNgEQiCEWISoWglRChUC
         CSE2CQkhsai8oIIEZZEQ8IDEAyAQD6gPtBXQIhUQhcaJtxl7vNvxeGyP19iO9y2O7dhxYsdrnMRL7Ln3
         8Pvu3L97PbbbNE0pV/ryn9yZe+/3nfOd8z83OXanD9/MAvDHPoTnw5/9/xy3S+w1F3TYw7czZivbvs1c
         8+3cVbDm2zjQOr3u2+Kmb5u7B6/7nwqJPkyfr960gGz7gmc1Fz2rnPGs/IJnCWHas9IpMMlnUM7nKtDM
@@ -216,7 +216,7 @@
   <data name="tsbPass.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAA27SURBVGhDxZlZbB13FcbdpC0gBAIJiUUgxBu0gUKhiBek
+        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAA27SURBVGhDxZlZbB13FcbdpC0gBAIJiUUgxBu0gUKhiBek
         PgClEn2DFx5AoKoV8MATEggkUIXEU0FVmxbRNkFtFu/7bsd27MSOd1/v+27H8RbHTmzn3jvz8Ttz5387
         vnGWQlL+4uvcO547833nfOf8z4Ss+7V8SYbw621XcB3/uZdrH/g6jISR20tK1+MHsZeQPP4WXpZe/xch
         mQ/dhuDMtq+eNV+tK57qFz1VzaVQOcsR1PH5wpKn7hVfU1d9Xds/mIUPRIg9xD3opifN7UD4iq+qBU+l
@@ -281,7 +281,7 @@
   <data name="tsbRecovery.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAA5OSURBVGhDzZl7bGTnWcad7CZtFCrSv6hEQJSbQEKoFagU
+        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAA5OSURBVGhDzZl7bGTnWcad7CZtFCrSv6hEQJSbQEKoFagU
         ISQQFSKUUipo1RaJSkCCUEv+aqUUiaoK/IEolEhJRaGtINn4PvbYnrHXXt+9vq29vl/XY3vs9a69Xt+9
         vs3MmfPwe785xzlevOmSJk0/7bvnMmfmPM97fb7dondi+ZIeZMEjP1rrrQB71wmdByDPjYOsdOfQ18o9
         X+k9X4vYzX1fawe+9jNSLn/2O+8KkegLjz3pJuBGNn213s6r4WZeyeW8Ekt51aUDW+QaS2JN3B9Yg9iO
@@ -348,7 +348,7 @@
   <data name="tsbConnect.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAABLSSURBVGhDvVkJlFvVeRbGlPQ0SWlKMQkxxGw5sQNxVjAN
+        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAABLSSURBVGhDvVkJlFvVeRbGlPQ0SWlKMQkxxGw5sQNxVjAN
         Li0hlJO0SVrS5RBOSk9y2BJKSM5pWiBpwuJgswwY23jBC97HMx6Px7NrRrN6pJFGM5JGGkkzo2W0j/Zd
         epLe1+9qJDI4JrQ5mHvON/e9p/f0vu/f7n81ivdryABk/hFz7dLvDPF55T3u+UDHuxEpk2mhXENpaT7f
         veKaEFU7/eDGuWSKJOjPlmCKFqAO5tDvyaDLlUanI4X2uRQ6ZpPo4/GoOw0TPw+mJJToitrjH6yQOnkR
@@ -435,7 +435,7 @@
   <data name="tsbPrint.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAA7mSURBVGhD1ZlZcFvXfcapum3SptMm05l4Jk/tg97qNs1L
+        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAA7mSURBVGhD1ZlZcFvXfcapum3SptMm05l4Jk/tg97qNs1L
         X/rUaR4Sd6YvfehMl6nTJJ7YriwpsceOY1dy5IoSCW5auG8gQHARCe47KXHfSQAiiH0HCYAEd4AgCBBf
         v3MBUKQs2nStOOqZOby4FyDu9/uv51xkfFUDSCA549Ixdfn/zwBiFL57LPwkSIJc0sUXcQBHkjgkFqj5
         L6hZdgyS4HuJRPxY/AsJIiwtHaP/AUR4eniBl/6MIIWYcYfRoI3CsLaP+FHsRRSfsn5cB2x/jYan+PBL
@@ -505,89 +505,89 @@
   <data name="tsbSearch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
-        AABJRU5ErkJggg==
+        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
+        SUVORK5CYII=
 </value>
   </data>
   <metadata name="dgcMListMaterialName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -599,15 +599,6 @@
   <metadata name="dgcMListQty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dgcMListMaterialName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dgcMListMaterialCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dgcMListQty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="dgcOrderNo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
diff --git a/APPQ5/QMAPP.WinForm/Forms/Operation/PrintPlanLabel.cs b/APPQ5/QMAPP.WinForm/Forms/Operation/PrintPlanLabel.cs
index 997f407..44f3257 100644
--- a/APPQ5/QMAPP.WinForm/Forms/Operation/PrintPlanLabel.cs
+++ b/APPQ5/QMAPP.WinForm/Forms/Operation/PrintPlanLabel.cs
@@ -427,8 +427,12 @@ namespace QMAPP.WinForm.Forms.Operation
             }
             tsbPrint.Enabled = false;
             var order1 = (FJC.Entity.ProductionPlan.WorkOrder)dgvPlan.Rows[0].DataBoundItem;
-            var order2 = (FJC.Entity.ProductionPlan.WorkOrder)dgvPlan.Rows[1].DataBoundItem;
-
+            var order2 = new FJC.Entity.ProductionPlan.WorkOrder();
+            if (dgvPlan.Rows.Count > 1)
+            {
+                order2 = (FJC.Entity.ProductionPlan.WorkOrder)dgvPlan.Rows[1].DataBoundItem;
+            }
+            
             var orders = new List<FJC.Entity.ProductionPlan.WorkOrder>();
             orders.Add(order1);
             if (string.Equals(order1.SEQ, order2.SEQ))
diff --git a/APPQ5/QMAPP.WinForm/MainForm.Designer.cs b/APPQ5/QMAPP.WinForm/MainForm.Designer.cs
index c9b594c..04c87e5 100644
--- a/APPQ5/QMAPP.WinForm/MainForm.Designer.cs
+++ b/APPQ5/QMAPP.WinForm/MainForm.Designer.cs
@@ -36,6 +36,7 @@
             this.btnInjectPut = new System.Windows.Forms.ToolStripMenuItem();
             this.btnInjectPutNEW = new System.Windows.Forms.ToolStripMenuItem();
             this.btnInjectPrintForm = new System.Windows.Forms.ToolStripMenuItem();
+            this.btnSewingPrint = new System.Windows.Forms.ToolStripMenuItem();
             this.搪塑下线ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.btnvVWSinglePrint = new System.Windows.Forms.ToolStripMenuItem();
             this.btnvVWSinglePrintNew = new System.Windows.Forms.ToolStripMenuItem();
@@ -108,7 +109,8 @@
             this.btnInjectPrint,
             this.btnInjectPut,
             this.btnInjectPutNEW,
-            this.btnInjectPrintForm});
+            this.btnInjectPrintForm,
+            this.btnSewingPrint});
             this.btnInjectGroup.Name = "btnInjectGroup";
             this.btnInjectGroup.Size = new System.Drawing.Size(94, 28);
             this.btnInjectGroup.Text = "注塑下线";
@@ -141,6 +143,13 @@
             this.btnInjectPrintForm.Text = "注塑条码补打";
             this.btnInjectPrintForm.Click += new System.EventHandler(this.btnInjectPrintForm_Click);
             // 
+            // btnInjectPrintForm
+            // 
+            this.btnSewingPrint.Name = "btnSewingPrint";
+            this.btnSewingPrint.Size = new System.Drawing.Size(188, 28);
+            this.btnSewingPrint.Text = "缝纫条码打印";
+            this.btnSewingPrint.Click += new System.EventHandler(this.btnSewingPrint_Click);
+            // 
             // 搪塑下线ToolStripMenuItem
             // 
             this.搪塑下线ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -496,6 +505,7 @@
         private System.Windows.Forms.ToolStripMenuItem btnInjectPut;
         private System.Windows.Forms.ToolStripMenuItem btnInjectPutNEW;
         private System.Windows.Forms.ToolStripMenuItem btnInjectPrintForm;
+        private System.Windows.Forms.ToolStripMenuItem btnSewingPrint;
         private System.Windows.Forms.ToolStripMenuItem btnOperateGroup;
         private System.Windows.Forms.ToolStripMenuItem btnOperateStation;
         private System.Windows.Forms.ToolStripMenuItem btnMendGroup;
diff --git a/APPQ5/QMAPP.WinForm/MainForm.cs b/APPQ5/QMAPP.WinForm/MainForm.cs
index 8458ccf..fb744d7 100644
--- a/APPQ5/QMAPP.WinForm/MainForm.cs
+++ b/APPQ5/QMAPP.WinForm/MainForm.cs
@@ -188,6 +188,26 @@ namespace QMAPP.WinForm
             }
         }
 
+        private void btnSewingPrint_Click(object sender, EventArgs e)
+        {
+            Form f = Application.OpenForms["SewingPrint"];  //查找是否打开过Form1窗体
+            if (f == null)  //没打开过
+            {
+                SewingPrint form = new SewingPrint();
+                ClientContext.SetUserAuth(form);
+                new KeyEvent().SetKeyToTxt(form);
+                form.MdiParent = this;
+                form.Show();   //重新new一个Show出来
+            }
+            else
+            {
+                f.WindowState = FormWindowState.Normal;
+                f.Focus();   //打开过就让其获得焦点
+            }
+        }
+
+        
+
         private void btnInjectionCheck_Click(object sender, EventArgs e)
         {
             Form f = Application.OpenForms["InjectionCheckListForm"];  //查找是否打开过Form1窗体
diff --git a/APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj b/APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj
index cab31b0..e370571 100644
--- a/APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj
+++ b/APPQ5/QMAPP.WinForm/QMAPP.WinForm.csproj
@@ -301,6 +301,12 @@
     <Compile Include="Forms\Injection\HintMassageForm.designer.cs">
       <DependentUpon>HintMassageForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="Forms\Injection\SewingPrint.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\Injection\SewingPrint.Designer.cs">
+      <DependentUpon>SewingPrint.cs</DependentUpon>
+    </Compile>
     <Compile Include="Forms\Injection\UpdatePasswordForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1104,6 +1110,9 @@
     <EmbeddedResource Include="Forms\Injection\HintMassageForm.resx">
       <DependentUpon>HintMassageForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Forms\Injection\SewingPrint.resx">
+      <DependentUpon>SewingPrint.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Forms\Injection\UpdatePasswordForm.resx">
       <DependentUpon>UpdatePasswordForm.cs</DependentUpon>
     </EmbeddedResource>
diff --git a/AppCommon/QMAPP.ServicesAgent/ServiceEnums.cs b/AppCommon/QMAPP.ServicesAgent/ServiceEnums.cs
index dc678d9..1466ddd 100644
--- a/AppCommon/QMAPP.ServicesAgent/ServiceEnums.cs
+++ b/AppCommon/QMAPP.ServicesAgent/ServiceEnums.cs
@@ -4309,6 +4309,12 @@ namespace QMAPP.ServicesAgent
         [Description("查询配置信息")]
         AppConfigBLL_Get,
 
+        /// <summary>
+        /// 更新配置
+        /// </summary>
+        [Description("更新配置")]
+        AppConfigBLL_UpdateAppConfig,
+
         /// <summary>
         /// 查询配置
         /// </summary>
@@ -4757,6 +4763,18 @@ namespace QMAPP.ServicesAgent
         /// </summary>
         ProductBLL_Get,
 
+        /// <summary>
+        /// 获取信息PID PRODUCTCODE
+        /// public Product Get(Product model)
+        /// </summary>
+        ProductBLL_GetList,
+
+        /// <summary>
+        /// 获取信息PID PRODUCTCODE
+        /// public Product Get(Product model)
+        /// </summary>
+        ProductBLL_GetListpro,
+
         /// <summary>
         /// 插入产品信息
         /// </summary>
diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
index 0482c95..4bfe422 100644
--- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
+++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
@@ -67,11 +67,16 @@
     <add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
     <add name="maindbBZD" connectionString="Data Source=10.111.144.98;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
   
- 
+
 
   <add name="maindb" connectionString="Data Source=10.111.144.99;Initial Catalog=ADIENT_CD_MES_20230930;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
   <add name="maindbBZD" connectionString="Data Source=10.111.144.99;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
  -->
+    
+      <add name="maindb" connectionString="Data Source=10.111.144.111;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password01;" providerName="System.Data.SqlClient"/>
+  <add name="maindbBZD" connectionString="Data Source=10.111.144.111;Initial Catalog=BZD;User Id=sa;Password=Password01;" providerName="System.Data.SqlClient"/>
+
+    
   <!--
     <add name="maindbYBB" connectionString="Data Source=10.111.144.72;Initial Catalog=scCFAACDYBNCSNF;User Id=mesreaderdcs;Password=mesreaderdcs;" providerName="System.Data.SqlClient"/>
     <add name="maindbNCSYBB" connectionString="Data Source=10.111.144.72;Initial Catalog=scCFAACDYBDY;User Id=mesreaderdcs;Password=mesreaderdcs;" providerName="System.Data.SqlClient"/>-->
@@ -79,10 +84,10 @@
 
     <!--<add name="maindb" connectionString="Data Source=10.111.144.99;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=CDmes123;max pool size=10240;" providerName="System.Data.SqlClient"/>-->
 
-
+    <!--
 
     <add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>
-    <!--
+   
     <add name="maindb" connectionString="Data Source=10.122.213.104;Initial Catalog=ADIENT_VW276_MES;User Id=MES;Password=Password1;" providerName="System.Data.SqlClient"/>
 -->
     <!--<add name="maindb" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=ADIENT_VW276PA_MES;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>-->