成都MP4升级

APP/QMAPP.Web/Web.config

@@ -40,7 +40,7 @@
     <!--主数据库连接-->
     <!--<add name="maindb" connectionString="Data Source=USER-20180104HU;Initial Catalog=CD_MES;User Id=sa;Password=qm;" 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.122.213.104;Initial Catalog=ADIENT_VW276_MES;User Id=MES;Password=Password1;" providerName="System.Data.SqlClient"/>
 
@@ -60,7 +60,11 @@
     <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="maindb" connectionString="Data Source=10.111.144.111;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=123u3M12912@1;" providerName="System.Data.SqlClient"/>
+<add name="maindbBZD" connectionString="Data Source=10.111.144.111;Initial Catalog=BZD;User Id=CDMESADM;Password=123u3M12912@1;" 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"/>-->
 
     <!--

APPMD/QMAPP.MD.BLL/MaterialClassBLL.cs

@@ -39,6 +39,30 @@ namespace QMAPP.MD.BLL
             result.IsSuccess = true;
             return result;
         }
+
+        /// <summary>
+        /// 获取信息
+        /// </summary>
+        /// <param name="">条件</param>
+        /// <returns>信息</returns>
+        public DataResult<MaterialClass> GetMP4(MaterialClass model)
+        {
+            DataResult<MaterialClass> result = new DataResult<MaterialClass>();
+            try
+            {
+                result.Result = new MaterialClassDAL().GetMP4(model);
+            }
+            catch (Exception ex)
+            {
+                result.IsSuccess = false;
+                result.Msg = Resource.SystemException;
+                throw ex;
+            }
+            result.IsSuccess = true;
+            return result;
+        }
+
+        
         #endregion
 
         #region 获取分页列表

APPMD/QMAPP.MD.DAL/MaterialClassDAL.cs

@@ -57,6 +57,45 @@ namespace QMAPP.MD.DAL
         }
         #endregion
 
+        #region 获取信息
+        /// <summary>
+        /// 获取信息
+        /// </summary>
+        /// <param name="">条件</param>
+        /// <returns>信息</returns>
+        public MaterialClass GetMP4(MaterialClass model)
+        {
+            string sql = null;
+            List<DataParameter> parameters = new List<DataParameter>();
+            try
+            {
+                sql = "SELECT * FROM T_MD_MATERIAL_CLASS WHERE '1'='1'";
+                if (string.IsNullOrEmpty(model.PID) == false)
+                {
+                    sql += " AND PID = @PID";
+                    parameters.Add(new DataParameter("PID", model.PID));
+                }
+                if (string.IsNullOrEmpty(model.MATERIAL_TYPE_CODE) == false)
+                {
+                    sql += " AND MATERIAL_TYPE_CODE = @MATERIAL_TYPE_CODE";
+                    parameters.Add(new DataParameter("MATERIAL_TYPE_CODE", model.MATERIAL_TYPE_CODE));
+                }
+                using (IDataSession session = AppDataFactory.CreateSession("maindbBC316_MP4"))
+                {
+                    string sqlChange = this.ChangeSqlByDB(sql, session);
+                    //获取信息
+                    model = session.Get<MaterialClass>(sqlChange, parameters.ToArray());
+                }
+                return model;
+            }
+            catch (Exception ex)
+            {
+                RecordExceptionLog(ex, "物料号信息数据层-获取信息");
+                throw ex;
+            }
+        }
+        #endregion
+
         #region 获取分页列表
         /// <summary>
         /// 获取分页列表

APPMD/QMAPP.MD.Web/Web.config

@@ -30,7 +30,7 @@
 
     <!--<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=123.56.115.74;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=qwe123$%^;" 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" />-->
 
     <!--<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"/>-->
 
@@ -46,6 +46,9 @@
     <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.111;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=123u3M12912@1;" providerName="System.Data.SqlClient"/>
+    <add name="maindbBZD" connectionString="Data Source=10.111.144.111;Initial Catalog=BZD;User Id=CDMESADM;Password=123u3M12912@1;" 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" />
  
@@ -58,9 +61,9 @@
 
     <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=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>
-     -->
+      -->
 <!--<add name="maindb" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>-->
 
   </connectionStrings>

APPQ5/QMAPP.FJC.BLL/FrmPlace/FrmPlaceBLL.cs

@@ -525,6 +525,24 @@ namespace QMAPP.FJC.BLL.FrmPlace
                 throw ex;
             }
 
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="code"></param>
+        /// <param name="line"></param>
+        /// <returns></returns>
+        public Product GetProductByAssembleCodeMP4(string code)
+        {
+            try
+            {
+                return new ProductDAL().GetProductByAssembleCodeMP4(code);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+
         }
 
         public QMAPP.FJC.Entity.SendManage.PastCard GetLastPastCard(string workcentercode)

APPQ5/QMAPP.FJC.BLL/ProductIn/ProductInBLL.cs

@@ -43,6 +43,10 @@ namespace QMAPP.FJC.BLL.ProductIn
         {
             return new DAL.ProductIn.ProductInDAL().GetInRecord(productcode);
         }
+        public Entity.ProductIn.ProductIn GetInRecordmp4(string productcode)
+        {
+            return new DAL.ProductIn.ProductInDAL().GetInRecordmp4(productcode);
+        }
         #endregion
         public DataResult<DataPage> GetListWeb(Entity.ProductIn.ProductIn condition, DataPage page)
         {

APPQ5/QMAPP.FJC.DAL/Operation/ProductDAL.cs

@@ -1561,6 +1561,28 @@ namespace QMAPP.FJC.DAL.Operation
             }
         }
 
+        public Product GetProductByAssembleCodeMP4(string code)
+        {
+            string sql = null;
+            Product model = new Product();
+            List<DataParameter> parameters = new List<DataParameter>();
+            try
+            {
+                sql = this.GetQuerySqlByAssemble(code);
+
+                using (IDataSession session = AppDataFactory.CreateSession("maindbBC316_MP4"))
+                {
+                    //获取信息
+                    model = session.Get<Product>(sql, parameters.ToArray());
+                }
+                return model;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
         #region 获取主体条码下的零件列表
 
         public List<Product> GetMainProductMaterialCodeList(string productcode)

APPQ5/QMAPP.FJC.DAL/ProductIn/ProductInDAL.cs

@@ -58,6 +58,28 @@ namespace QMAPP.FJC.DAL.ProductIn
                 throw ex;
             }
         }
+        /// <summary>
+        /// 获取入库记录
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public Entity.ProductIn.ProductIn GetInRecordmp4(string productcode)
+        {
+            try
+            {
+                List<DataParameter> parameters = new List<DataParameter>();
+                string sql = "SELECT * FROM T_AW_PRODUCTIN WHERE PRODUCTCODE=@productcode";
+                using (IDataSession session = AppDataFactory.CreateSession("maindbBC316_MP4"))
+                {
+                    parameters.Add(new DataParameter("productcode", productcode));
+                    return session.Get<Entity.ProductIn.ProductIn>(sql, parameters.ToArray());
+                }
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
         #endregion
 
         public DataPage GetList(Entity.ProductIn.ProductIn condition, DataPage page)

APPQ5/QMAPP.FJC.DAL/TianJin/StorageDAL.cs

@@ -252,10 +252,18 @@ namespace QMAPP.FJC.DAL.TianJin
             int count = 0;
             try
             {
+                List<DataParameter> parameters = new List<DataParameter>();
+                var select_sql = $"select * from T_AW_StorageLog  where ProductCode = '{info.ProductCode}' and State = '{info.State}' and CREATEUSER = '{info.CREATEUSER}'";
+
                 using (IDataSession session = AppDataFactory.CreateMainSession())
                 {
-                    //插入基本信息
+                    var list = session.GetList<StorageLog>(select_sql, parameters.ToArray()).ToList();
-                    count = session.Insert<Storage>(info);
+                    if (list.Count <= 0)
+                    {
+                        //插入基本信息
+                        count = session.Insert<Storage>(info);
+                    }
+                    
                 }
                 return count;
             }

APPQ5/QMAPP.FJC.DAL/TianJin/StorageLogDAL.cs

@@ -229,10 +229,16 @@ namespace QMAPP.FJC.DAL.TianJin
             int count = 0;
             try
             {
+                List<DataParameter> parameters = new List<DataParameter>();
+                var select_sql = $"select * from T_AW_StorageLog  where ProductCode = '{info.ProductCode}' and State = '{info.State}' and CREATEUSER = '{info.CREATEUSER}'";
                 using (IDataSession session = AppDataFactory.CreateMainSession())
                 {
-                    //插入基本信息
+                    var list = session.GetList<StorageLog>(select_sql, parameters.ToArray()).ToList();
-                    count = session.Insert<StorageLog>(info);
+                    if (list.Count <= 0)
+                    {
+                        //插入基本信息
+                        count = session.Insert<StorageLog>(info);
+                    }
                 }
                 return count;
             }

APPQ5/QMAPP.FJC.TRACING/DAHandler/DataAcquirer.cs

@@ -221,14 +221,14 @@ namespace QMAPP.FJC.TRACING.DAHandler
                 data.WorkLocState.LoadState(Args.MouldCode);
                 result.MouldCode = data.MouldCode;
                 ////判断是否已生成产品数据
-                //if (string.IsNullOrWhiteSpace(data.WorkLocState.CurrentState.PROCESS_CODE))
+                if (string.IsNullOrWhiteSpace(data.WorkLocState.CurrentState.PROCESS_CODE))
-                //{
+                {
-                //    throw new Exception(string.Format("当前状态“{0}”，无法执行撤销操作！", data.WorkLocState.CurrentState.STATE_NAME));
+                    throw new Exception(string.Format("当前状态“{0}”，无法执行撤销操作！", data.WorkLocState.CurrentState.STATE_NAME));
-                //}
+                }
-                //StateActions.RollbackWithOrder rollback = new StateActions.RollbackWithOrder(); //执行数据回滚动作
+                StateActions.RollbackWithOrder rollback = new StateActions.RollbackWithOrder(); //执行数据回滚动作
-                //rollback.Execute(data);
+                rollback.Execute(data);
-                //StateActions.ResetData resetdata = new StateActions.ResetData(); //执行数据复位
+                StateActions.ResetData resetdata = new StateActions.ResetData(); //执行数据复位
-                //resetdata.Execute(data);
+                resetdata.Execute(data);
                 if (string.Equals(data.WorkLocState.CurrentState.ROLLBACK_ACTION, "N/A"))
                 {
                     throw new Exception(string.Format("当前状态“{0}”，无法执行撤销操作！", data.WorkLocState.CurrentState.STATE_NAME));
@@ -242,6 +242,7 @@ namespace QMAPP.FJC.TRACING.DAHandler
                             result.Actions.Add(action);
                     }
                 }
+
                 result.StateChanged = true;
                 SetToFirstState(data);
                 foreach (var action in data.WorkLocState.CurrentState.ENTRY_ACTION.Split(';'))//执行进入状态动作

APPQ5/QMAPP.FJC.TRACING/DataValidators/BOMValidator.cs

@@ -28,8 +28,9 @@ namespace QMAPP.FJC.TRACING.DataValidators
                                        && da.ISPROCESSCODE == "1")) //过滤掉当前输入的采集点
                              select da.MATERIAL_CODE).ToList();
             PbomDAL dal = new PbomDAL();
+            if(!string.IsNullOrEmpty(data.MaterialCode))
+                materials.Add(data.MaterialCode + "");
 
-            materials.Add(data.MaterialCode+"");
             var bomlocates = dal.LocateBom(materials.Distinct().ToArray()); //匹配物料BOM
             if (data != null && data.OrderPlan != null)
             {

APPQ5/QMAPP.FJC.Web/Web.config

@@ -31,7 +31,7 @@
 
     <!--<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.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.122.213.104;Initial Catalog=ADIENT_VW276_MES;User Id=MES;Password=Password1;" providerName="System.Data.SqlClient"/>
    
@@ -63,6 +63,9 @@
     <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.111;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=123u3M12912@1;" providerName="System.Data.SqlClient"/>
+    <add name="maindbBZD" connectionString="Data Source=10.111.144.111;Initial Catalog=BZD;User Id=CDMESADM;Password=123u3M12912@1;" providerName="System.Data.SqlClient"/>
+
 
     <!--<add name="maindb" connectionString="Data Source=.;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Microsoft2008;" providerName="System.Data.SqlClient"/>
     <add name="maindbBZD" connectionString="Data Source=.;Initial Catalog=BZD;User Id=sa;Password=Microsoft2008;" providerName="System.Data.SqlClient"/>-->

APPQ5/QMAPP.WinForm/App.config

@@ -3,24 +3,28 @@
   <connectionStrings>
     <!--主数据库连接-->
 
+
+
+    <add name="maindb" connectionString="Data Source=10.111.144.111;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=123u3M12912@1;" providerName="System.Data.SqlClient"/>
+    <add name="maindbBZD" connectionString="Data Source=10.111.144.111;Initial Catalog=BZD;User Id=CDMESADM;Password=123u3M12912@1;" 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=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="maindbBC316_MP4" connectionString="Data Source=10.111.144.111;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=123u3M12912@1;" 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"/>
@@ -29,10 +33,10 @@
   
    
     <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=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.122.213.104;Initial Catalog=ADIENT_VW276_MES;User Id=MES;Password=Password1;" providerName="System.Data.SqlClient"/>
     
   -->
@@ -175,7 +179,7 @@
     <add key="SleepSecond2" value="3" />
     <add key="RefreshTime" value="52" />
     <add key="LoginName" value="dcsnf" />
-    <add key="UpperBarcodeLen" value="20" />
+    <add key="UpperBarcodeLen" value="22" />
     <add key="LowerBarcodeLen" value="5" />
     <add key="PlaceFirstPositionCode" value="FirstPosition" />
     <add key="PlaceFirstPositionType" value="False" />
@@ -238,12 +242,16 @@
 
       <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://127.0.0.1:4444/OpcService" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IOpcService" contract="ServiceOpc.IOpcService" name="NetTcpBinding_IOpcService" />
-      
+
-       <!--<endpoint address="http://10.111.144.110:8938/GeneralService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="CenterGeneralService.IGeneralService" name="BasicHttpBinding_IGeneralService" />
+ 
+         -->
+      <endpoint address="net.tcp://10.111.144.102:4444/OpcService" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IOpcService" contract="ServiceOpc.IOpcService" name="NetTcpBinding_IOpcService" />
+
+
+
+      <!--<endpoint address="http://10.111.144.110:8938/GeneralService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="CenterGeneralService.IGeneralService" name="BasicHttpBinding_IGeneralService" />
       <endpoint address="http://10.111.144.110: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" />-->
 

APPQ5/QMAPP.WinForm/Forms/DisPatch/FrmPlace.cs

@@ -1522,8 +1522,18 @@ namespace QMAPP.WinForm.Forms.DisPatch
                         Code = Code.Substring(Code.LastIndexOf('-') + 1);
                     }
                     #region 去数据库查询相关产品信息，外来零件忽略此步骤
-                    Product product = agent.InvokeServiceFunction<Product>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetProductByAssembleCode.ToString(), Code);
 
+                    Product product = null;
+                    if (System.Text.RegularExpressions.Regex.IsMatch(Code, "^BCP"))
+                    {
+                        //BCP开头的是BC316-MP4的包覆件
+                        product = agent.InvokeServiceFunction<Product>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetProductByAssembleCodeMP4.ToString(), Code);
+                    }
+                    else
+                    {
+                        product = agent.InvokeServiceFunction<Product>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetProductByAssembleCode.ToString(), Code);
+                    }
+                    
                     if (product != null)
                     {
                         Code = string.IsNullOrEmpty(product.MAINCODE) ? product.PRODUCTCODE : product.MAINCODE;
@@ -1594,8 +1604,13 @@ namespace QMAPP.WinForm.Forms.DisPatch
                             txtCode.Focus();
                             return;
                         }
+
                         var mcresult = agent.InvokeServiceFunction<DataResult<MaterialClass>>("MaterialClassBLL_Get", new MaterialClass { MATERIAL_TYPE_CODE = product.MATERIAL_TYPE });
-                        var mc = mcresult.IsSuccess ? mcresult.Result : new MaterialClass { };
+                    if (System.Text.RegularExpressions.Regex.IsMatch(product.PRODUCTCODE, "^BCP"))
+                    {
+                        mcresult = agent.InvokeServiceFunction<DataResult<MaterialClass>>("MaterialClassBLL_GetMP4", new MaterialClass { MATERIAL_TYPE_CODE = product.MATERIAL_TYPE });
+                    }
+                    var mc = mcresult.IsSuccess ? mcresult.Result : new MaterialClass { };
                         if (!string.Equals(mc.MATERIAL_ATTRIBUTE, "2"))
                         {
                             SetContainerItem(nfindex, false);
@@ -1605,6 +1620,10 @@ namespace QMAPP.WinForm.Forms.DisPatch
                             return;
                         }
                         FJC.Entity.ProductIn.ProductIn inrecord = agent.InvokeServiceFunction<FJC.Entity.ProductIn.ProductIn>("ProductInBLL_GetInRecord", Code);
+                    if (System.Text.RegularExpressions.Regex.IsMatch(product.PRODUCTCODE, "^BCP"))
+                    {
+                        inrecord = agent.InvokeServiceFunction<FJC.Entity.ProductIn.ProductIn>("ProductInBLL_GetInRecordmp4", Code);
+                    }
                         if (inrecord != null)
                         {
                             SetContainerItem(nfindex, false);

APPQ5/QMAPP.WinForm/Forms/Injection/InjectionCodePrint.Designer.cs

@@ -29,12 +29,12 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = 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();
@@ -72,6 +72,8 @@
             this.cbSkipHistory = new System.Windows.Forms.CheckBox();
             this.btnStartFileScan = new System.Windows.Forms.Button();
             this.btnStopFileScan = new System.Windows.Forms.Button();
+            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();
@@ -81,8 +83,6 @@
             this.lblLastCount = new System.Windows.Forms.Label();
             this.label7 = new System.Windows.Forms.Label();
             this.label8 = new System.Windows.Forms.Label();
-            this.tpManual = new System.Windows.Forms.TabPage();
-            this.cbTemplateDesign = new System.Windows.Forms.CheckBox();
             this.timer2 = new System.Windows.Forms.Timer(this.components);
             this.tabControl1 = new System.Windows.Forms.TabControl();
             this.tabPage1 = new System.Windows.Forms.TabPage();
@@ -111,8 +111,8 @@
             this.groupBox3.SuspendLayout();
             this.tpPrintMode.SuspendLayout();
             this.tpOnline.SuspendLayout();
-            this.tpTimer.SuspendLayout();
             this.tpManual.SuspendLayout();
+            this.tpTimer.SuspendLayout();
             this.tabControl1.SuspendLayout();
             this.tabPage1.SuspendLayout();
             this.tabPage2.SuspendLayout();
@@ -128,14 +128,14 @@
             this.DGView.AllowUserToDeleteRows = false;
             this.DGView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
             this.DGView.BackgroundColor = System.Drawing.SystemColors.ButtonFace;
-            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle13.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.DGView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle13;
+            this.DGView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
             this.DGView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.DGView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.MAINCODE,
@@ -143,28 +143,29 @@
             this.PRODUCTCODE,
             this.CREATETIME});
             this.DGView.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.DGView.Location = new System.Drawing.Point(3, 3);
+            this.DGView.Location = new System.Drawing.Point(4, 4);
+            this.DGView.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.DGView.Name = "DGView";
             this.DGView.ReadOnly = true;
-            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle18.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.DGView.RowHeadersDefaultCellStyle = dataGridViewCellStyle18;
+            this.DGView.RowHeadersDefaultCellStyle = dataGridViewCellStyle6;
             this.DGView.RowTemplate.Height = 23;
             this.DGView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.DGView.Size = new System.Drawing.Size(667, 567);
+            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";
-            dataGridViewCellStyle14.Font = new System.Drawing.Font("宋体", 15.75F);
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 15.75F);
-            this.MAINCODE.DefaultCellStyle = dataGridViewCellStyle14;
+            this.MAINCODE.DefaultCellStyle = dataGridViewCellStyle2;
             this.MAINCODE.FillWeight = 48.95314F;
             this.MAINCODE.HeaderText = "条码信息";
             this.MAINCODE.Name = "MAINCODE";
@@ -175,8 +176,8 @@
             // 
             this.MATERIAL_NAME.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.MATERIAL_NAME.DataPropertyName = "MATERIAL_NAME";
-            dataGridViewCellStyle15.Font = new System.Drawing.Font("宋体", 15.75F);
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 15.75F);
-            this.MATERIAL_NAME.DefaultCellStyle = dataGridViewCellStyle15;
+            this.MATERIAL_NAME.DefaultCellStyle = dataGridViewCellStyle3;
             this.MATERIAL_NAME.FillWeight = 99.90437F;
             this.MATERIAL_NAME.HeaderText = "零件名称";
             this.MATERIAL_NAME.Name = "MATERIAL_NAME";
@@ -187,8 +188,8 @@
             // 
             this.PRODUCTCODE.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.PRODUCTCODE.DataPropertyName = "PRODUCTCODE";
-            dataGridViewCellStyle16.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PRODUCTCODE.DefaultCellStyle = dataGridViewCellStyle16;
+            this.PRODUCTCODE.DefaultCellStyle = dataGridViewCellStyle4;
             this.PRODUCTCODE.FillWeight = 48.95314F;
             this.PRODUCTCODE.HeaderText = "零件号";
             this.PRODUCTCODE.Name = "PRODUCTCODE";
@@ -199,11 +200,11 @@
             // 
             this.CREATETIME.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.CREATETIME.DataPropertyName = "CREATETIME";
-            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle17.Font = new System.Drawing.Font("宋体", 15.75F);
+            dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 15.75F);
-            dataGridViewCellStyle17.Format = "f";
+            dataGridViewCellStyle5.Format = "f";
-            dataGridViewCellStyle17.NullValue = null;
+            dataGridViewCellStyle5.NullValue = null;
-            this.CREATETIME.DefaultCellStyle = dataGridViewCellStyle17;
+            this.CREATETIME.DefaultCellStyle = dataGridViewCellStyle5;
             this.CREATETIME.FillWeight = 48.95314F;
             this.CREATETIME.HeaderText = "操作时间";
             this.CREATETIME.Name = "CREATETIME";
@@ -214,9 +215,10 @@
             // 
             this.paneldouble.Controls.Add(this.comboxMaterial);
             this.paneldouble.Controls.Add(this.label2);
-            this.paneldouble.Location = new System.Drawing.Point(0, 215);
+            this.paneldouble.Location = new System.Drawing.Point(0, 322);
+            this.paneldouble.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.paneldouble.Name = "paneldouble";
-            this.paneldouble.Size = new System.Drawing.Size(449, 38);
+            this.paneldouble.Size = new System.Drawing.Size(674, 57);
             this.paneldouble.TabIndex = 52;
             this.paneldouble.Visible = false;
             // 
@@ -224,27 +226,30 @@
             // 
             this.comboxMaterial.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboxMaterial.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.comboxMaterial.Location = new System.Drawing.Point(71, 3);
+            this.comboxMaterial.Location = new System.Drawing.Point(106, 4);
+            this.comboxMaterial.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.comboxMaterial.Name = "comboxMaterial";
-            this.comboxMaterial.Size = new System.Drawing.Size(369, 30);
+            this.comboxMaterial.Size = new System.Drawing.Size(552, 39);
             this.comboxMaterial.TabIndex = 40;
             // 
             // label2
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(0, 7);
+            this.label2.Location = new System.Drawing.Point(0, 10);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(67, 22);
+            this.label2.Size = new System.Drawing.Size(99, 31);
             this.label2.TabIndex = 41;
             this.label2.Text = "零件#2:";
             // 
             // btnChoiceMaterial
             // 
             this.btnChoiceMaterial.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnChoiceMaterial.Location = new System.Drawing.Point(6, 86);
+            this.btnChoiceMaterial.Location = new System.Drawing.Point(9, 129);
+            this.btnChoiceMaterial.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnChoiceMaterial.Name = "btnChoiceMaterial";
-            this.btnChoiceMaterial.Size = new System.Drawing.Size(124, 44);
+            this.btnChoiceMaterial.Size = new System.Drawing.Size(186, 66);
             this.btnChoiceMaterial.TabIndex = 37;
             this.btnChoiceMaterial.Text = "选择零件信息";
             this.btnChoiceMaterial.UseVisualStyleBackColor = true;
@@ -255,9 +260,10 @@
             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(241, 6);
+            this.tsbPrint.Location = new System.Drawing.Point(362, 9);
+            this.tsbPrint.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tsbPrint.Name = "tsbPrint";
-            this.tsbPrint.Size = new System.Drawing.Size(190, 83);
+            this.tsbPrint.Size = new System.Drawing.Size(285, 124);
             this.tsbPrint.TabIndex = 34;
             this.tsbPrint.Text = "打印";
             this.tsbPrint.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -269,22 +275,24 @@
             // 
             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(70, 141);
+            this.textMaterialName.Location = new System.Drawing.Point(105, 212);
+            this.textMaterialName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.textMaterialName.MaxLength = 3096;
             this.textMaterialName.Name = "textMaterialName";
             this.textMaterialName.ReadOnly = true;
-            this.textMaterialName.Size = new System.Drawing.Size(370, 29);
+            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(70, 180);
+            this.txtMaterialCode.Location = new System.Drawing.Point(105, 270);
+            this.txtMaterialCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtMaterialCode.MaxLength = 3096;
             this.txtMaterialCode.Name = "txtMaterialCode";
             this.txtMaterialCode.ReadOnly = true;
-            this.txtMaterialCode.Size = new System.Drawing.Size(370, 29);
+            this.txtMaterialCode.Size = new System.Drawing.Size(553, 39);
             this.txtMaterialCode.TabIndex = 30;
             this.txtMaterialCode.TextChanged += new System.EventHandler(this.txtMaterialCode_TextChanged);
             // 
@@ -292,9 +300,10 @@
             // 
             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(3, 183);
+            this.label6.Location = new System.Drawing.Point(4, 274);
+            this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(63, 22);
+            this.label6.Size = new System.Drawing.Size(93, 31);
             this.label6.TabIndex = 29;
             this.label6.Text = "零件号:";
             // 
@@ -302,9 +311,10 @@
             // 
             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(3, 144);
+            this.label1.Location = new System.Drawing.Point(4, 216);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(63, 22);
+            this.label1.Size = new System.Drawing.Size(93, 31);
             this.label1.TabIndex = 25;
             this.label1.Text = "零件名:";
             // 
@@ -314,9 +324,11 @@
             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(685, 4);
+            this.groupBox1.Location = new System.Drawing.Point(1028, 6);
+            this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(451, 607);
+            this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.groupBox1.Size = new System.Drawing.Size(676, 910);
             this.groupBox1.TabIndex = 40;
             this.groupBox1.TabStop = false;
             // 
@@ -336,10 +348,10 @@
             this.plPrintSetting.Controls.Add(this.comMachine);
             this.plPrintSetting.Controls.Add(this.btnLockMachine);
             this.plPrintSetting.Dock = System.Windows.Forms.DockStyle.Top;
-            this.plPrintSetting.Location = new System.Drawing.Point(3, 25);
+            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(445, 404);
+            this.plPrintSetting.Size = new System.Drawing.Size(668, 606);
             this.plPrintSetting.TabIndex = 64;
             // 
             // panel34
@@ -350,9 +362,10 @@
             this.panel34.Controls.Add(this.txtMaterial3);
             this.panel34.Controls.Add(this.labelTex4);
             this.panel34.Controls.Add(this.labelTex3);
-            this.panel34.Location = new System.Drawing.Point(0, 212);
+            this.panel34.Location = new System.Drawing.Point(0, 318);
+            this.panel34.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.panel34.Name = "panel34";
-            this.panel34.Size = new System.Drawing.Size(449, 118);
+            this.panel34.Size = new System.Drawing.Size(674, 177);
             this.panel34.TabIndex = 50;
             this.panel34.Visible = false;
             // 
@@ -360,20 +373,22 @@
             // 
             this.txtMaterial2.BackColor = System.Drawing.SystemColors.Control;
             this.txtMaterial2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtMaterial2.Location = new System.Drawing.Point(70, 8);
+            this.txtMaterial2.Location = new System.Drawing.Point(105, 12);
+            this.txtMaterial2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtMaterial2.MaxLength = 3096;
             this.txtMaterial2.Name = "txtMaterial2";
             this.txtMaterial2.ReadOnly = true;
-            this.txtMaterial2.Size = new System.Drawing.Size(369, 29);
+            this.txtMaterial2.Size = new System.Drawing.Size(552, 39);
             this.txtMaterial2.TabIndex = 56;
             // 
             // labelTex2
             // 
             this.labelTex2.AutoSize = true;
             this.labelTex2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.labelTex2.Location = new System.Drawing.Point(1, 11);
+            this.labelTex2.Location = new System.Drawing.Point(2, 16);
+            this.labelTex2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.labelTex2.Name = "labelTex2";
-            this.labelTex2.Size = new System.Drawing.Size(67, 22);
+            this.labelTex2.Size = new System.Drawing.Size(99, 31);
             this.labelTex2.TabIndex = 55;
             this.labelTex2.Text = "零件#2:";
             // 
@@ -381,31 +396,34 @@
             // 
             this.txtMaterial4.BackColor = System.Drawing.SystemColors.Control;
             this.txtMaterial4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtMaterial4.Location = new System.Drawing.Point(71, 83);
+            this.txtMaterial4.Location = new System.Drawing.Point(106, 124);
+            this.txtMaterial4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtMaterial4.MaxLength = 3096;
             this.txtMaterial4.Name = "txtMaterial4";
             this.txtMaterial4.ReadOnly = true;
-            this.txtMaterial4.Size = new System.Drawing.Size(368, 29);
+            this.txtMaterial4.Size = new System.Drawing.Size(550, 39);
             this.txtMaterial4.TabIndex = 54;
             // 
             // txtMaterial3
             // 
             this.txtMaterial3.BackColor = System.Drawing.SystemColors.Control;
             this.txtMaterial3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtMaterial3.Location = new System.Drawing.Point(70, 45);
+            this.txtMaterial3.Location = new System.Drawing.Point(105, 68);
+            this.txtMaterial3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtMaterial3.MaxLength = 3096;
             this.txtMaterial3.Name = "txtMaterial3";
             this.txtMaterial3.ReadOnly = true;
-            this.txtMaterial3.Size = new System.Drawing.Size(369, 29);
+            this.txtMaterial3.Size = new System.Drawing.Size(552, 39);
             this.txtMaterial3.TabIndex = 53;
             // 
             // labelTex4
             // 
             this.labelTex4.AutoSize = true;
             this.labelTex4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.labelTex4.Location = new System.Drawing.Point(1, 86);
+            this.labelTex4.Location = new System.Drawing.Point(2, 129);
+            this.labelTex4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.labelTex4.Name = "labelTex4";
-            this.labelTex4.Size = new System.Drawing.Size(67, 22);
+            this.labelTex4.Size = new System.Drawing.Size(99, 31);
             this.labelTex4.TabIndex = 50;
             this.labelTex4.Text = "零件#4:";
             // 
@@ -413,9 +431,10 @@
             // 
             this.labelTex3.AutoSize = true;
             this.labelTex3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.labelTex3.Location = new System.Drawing.Point(1, 48);
+            this.labelTex3.Location = new System.Drawing.Point(2, 72);
+            this.labelTex3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.labelTex3.Name = "labelTex3";
-            this.labelTex3.Size = new System.Drawing.Size(67, 22);
+            this.labelTex3.Size = new System.Drawing.Size(99, 31);
             this.labelTex3.TabIndex = 49;
             this.labelTex3.Text = "零件#3:";
             // 
@@ -424,18 +443,20 @@
             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(70, 44);
+            this.cbMould.Location = new System.Drawing.Point(105, 66);
+            this.cbMould.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.cbMould.Name = "cbMould";
-            this.cbMould.Size = new System.Drawing.Size(370, 30);
+            this.cbMould.Size = new System.Drawing.Size(553, 39);
             this.cbMould.TabIndex = 60;
             // 
             // 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(2, 6);
+            this.label9.Location = new System.Drawing.Point(3, 9);
+            this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(63, 22);
+            this.label9.Size = new System.Drawing.Size(93, 31);
             this.label9.TabIndex = 25;
             this.label9.Text = "注塑机:";
             // 
@@ -445,9 +466,11 @@
             this.groupBox3.Controls.Add(this.radioButDouble);
             this.groupBox3.Controls.Add(this.radioButFourth);
             this.groupBox3.Enabled = false;
-            this.groupBox3.Location = new System.Drawing.Point(136, 73);
+            this.groupBox3.Location = new System.Drawing.Point(204, 110);
+            this.groupBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(303, 58);
+            this.groupBox3.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.groupBox3.Size = new System.Drawing.Size(454, 87);
             this.groupBox3.TabIndex = 49;
             this.groupBox3.TabStop = false;
             // 
@@ -455,9 +478,10 @@
             // 
             this.radioButSignal.AutoSize = true;
             this.radioButSignal.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.radioButSignal.Location = new System.Drawing.Point(7, 22);
+            this.radioButSignal.Location = new System.Drawing.Point(10, 33);
+            this.radioButSignal.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.radioButSignal.Name = "radioButSignal";
-            this.radioButSignal.Size = new System.Drawing.Size(92, 26);
+            this.radioButSignal.Size = new System.Drawing.Size(135, 35);
             this.radioButSignal.TabIndex = 44;
             this.radioButSignal.TabStop = true;
             this.radioButSignal.Text = "单件打印";
@@ -468,9 +492,10 @@
             // 
             this.radioButDouble.AutoSize = true;
             this.radioButDouble.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.radioButDouble.Location = new System.Drawing.Point(107, 22);
+            this.radioButDouble.Location = new System.Drawing.Point(160, 33);
+            this.radioButDouble.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.radioButDouble.Name = "radioButDouble";
-            this.radioButDouble.Size = new System.Drawing.Size(92, 26);
+            this.radioButDouble.Size = new System.Drawing.Size(135, 35);
             this.radioButDouble.TabIndex = 45;
             this.radioButDouble.TabStop = true;
             this.radioButDouble.Text = "双件打印";
@@ -481,9 +506,10 @@
             // 
             this.radioButFourth.AutoSize = true;
             this.radioButFourth.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.radioButFourth.Location = new System.Drawing.Point(207, 22);
+            this.radioButFourth.Location = new System.Drawing.Point(310, 33);
+            this.radioButFourth.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.radioButFourth.Name = "radioButFourth";
-            this.radioButFourth.Size = new System.Drawing.Size(92, 26);
+            this.radioButFourth.Size = new System.Drawing.Size(135, 35);
             this.radioButFourth.TabIndex = 46;
             this.radioButFourth.TabStop = true;
             this.radioButFourth.Text = "四件打印";
@@ -494,9 +520,10 @@
             // 
             this.label10.AutoSize = true;
             this.label10.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label10.Location = new System.Drawing.Point(18, 48);
+            this.label10.Location = new System.Drawing.Point(27, 72);
+            this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(47, 22);
+            this.label10.Size = new System.Drawing.Size(69, 31);
             this.label10.TabIndex = 61;
             this.label10.Text = "模具:";
             // 
@@ -505,18 +532,20 @@
             this.comMachine.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comMachine.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.comMachine.FormattingEnabled = true;
-            this.comMachine.Location = new System.Drawing.Point(71, 4);
+            this.comMachine.Location = new System.Drawing.Point(106, 6);
+            this.comMachine.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.comMachine.Name = "comMachine";
-            this.comMachine.Size = new System.Drawing.Size(297, 30);
+            this.comMachine.Size = new System.Drawing.Size(444, 39);
             this.comMachine.TabIndex = 60;
             this.comMachine.SelectedIndexChanged += new System.EventHandler(this.comMachine_SelectedIndexChanged);
             // 
             // btnLockMachine
             // 
             this.btnLockMachine.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnLockMachine.Location = new System.Drawing.Point(374, 3);
+            this.btnLockMachine.Location = new System.Drawing.Point(561, 4);
+            this.btnLockMachine.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnLockMachine.Name = "btnLockMachine";
-            this.btnLockMachine.Size = new System.Drawing.Size(67, 32);
+            this.btnLockMachine.Size = new System.Drawing.Size(100, 48);
             this.btnLockMachine.TabIndex = 63;
             this.btnLockMachine.Text = "锁定";
             this.btnLockMachine.UseVisualStyleBackColor = true;
@@ -529,11 +558,12 @@
             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(3, 458);
+            this.tpPrintMode.Location = new System.Drawing.Point(4, 687);
+            this.tpPrintMode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 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(445, 146);
+            this.tpPrintMode.Size = new System.Drawing.Size(668, 219);
             this.tpPrintMode.TabIndex = 62;
             // 
             // tpOnline
@@ -541,10 +571,11 @@
             this.tpOnline.Controls.Add(this.cbSkipHistory);
             this.tpOnline.Controls.Add(this.btnStartFileScan);
             this.tpOnline.Controls.Add(this.btnStopFileScan);
-            this.tpOnline.Location = new System.Drawing.Point(4, 47);
+            this.tpOnline.Location = new System.Drawing.Point(4, 58);
+            this.tpOnline.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tpOnline.Name = "tpOnline";
-            this.tpOnline.Padding = new System.Windows.Forms.Padding(3);
+            this.tpOnline.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.tpOnline.Size = new System.Drawing.Size(437, 95);
+            this.tpOnline.Size = new System.Drawing.Size(660, 157);
             this.tpOnline.TabIndex = 0;
             this.tpOnline.Text = "注塑联机打印";
             this.tpOnline.UseVisualStyleBackColor = true;
@@ -556,9 +587,10 @@
             this.cbSkipHistory.Checked = true;
             this.cbSkipHistory.CheckState = System.Windows.Forms.CheckState.Checked;
             this.cbSkipHistory.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cbSkipHistory.Location = new System.Drawing.Point(19, 19);
+            this.cbSkipHistory.Location = new System.Drawing.Point(28, 28);
+            this.cbSkipHistory.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.cbSkipHistory.Name = "cbSkipHistory";
-            this.cbSkipHistory.Size = new System.Drawing.Size(78, 60);
+            this.cbSkipHistory.Size = new System.Drawing.Size(114, 87);
             this.cbSkipHistory.TabIndex = 60;
             this.cbSkipHistory.Text = "扫描跳过\r\n历史数据";
             this.cbSkipHistory.UseVisualStyleBackColor = true;
@@ -567,9 +599,10 @@
             // 
             this.btnStartFileScan.Font = new System.Drawing.Font("微软雅黑", 13F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnStartFileScan.Image = global::QMAPP.WinForm.Resource1.forward;
-            this.btnStartFileScan.Location = new System.Drawing.Point(114, 6);
+            this.btnStartFileScan.Location = new System.Drawing.Point(171, 9);
+            this.btnStartFileScan.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnStartFileScan.Name = "btnStartFileScan";
-            this.btnStartFileScan.Size = new System.Drawing.Size(150, 83);
+            this.btnStartFileScan.Size = new System.Drawing.Size(225, 124);
             this.btnStartFileScan.TabIndex = 59;
             this.btnStartFileScan.Text = "启动参数\r\n文件扫描";
             this.btnStartFileScan.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -582,9 +615,10 @@
             this.btnStopFileScan.Enabled = false;
             this.btnStopFileScan.Font = new System.Drawing.Font("微软雅黑", 13F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnStopFileScan.Image = global::QMAPP.WinForm.Resource1.st;
-            this.btnStopFileScan.Location = new System.Drawing.Point(270, 6);
+            this.btnStopFileScan.Location = new System.Drawing.Point(405, 9);
+            this.btnStopFileScan.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnStopFileScan.Name = "btnStopFileScan";
-            this.btnStopFileScan.Size = new System.Drawing.Size(150, 83);
+            this.btnStopFileScan.Size = new System.Drawing.Size(225, 124);
             this.btnStopFileScan.TabIndex = 58;
             this.btnStopFileScan.Text = "停止参数\r\n文件扫描";
             this.btnStopFileScan.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -592,6 +626,31 @@
             this.btnStopFileScan.UseVisualStyleBackColor = true;
             this.btnStopFileScan.Click += new System.EventHandler(this.btnStopFileScan_Click);
             // 
+            // 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, 4, 4, 4);
+            this.tpManual.Name = "tpManual";
+            this.tpManual.Padding = new System.Windows.Forms.Padding(4, 4, 4, 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, 4, 4, 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);
@@ -602,10 +661,11 @@
             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, 47);
+            this.tpTimer.Location = new System.Drawing.Point(4, 58);
+            this.tpTimer.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tpTimer.Name = "tpTimer";
-            this.tpTimer.Padding = new System.Windows.Forms.Padding(3);
+            this.tpTimer.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.tpTimer.Size = new System.Drawing.Size(437, 95);
+            this.tpTimer.Size = new System.Drawing.Size(660, 157);
             this.tpTimer.TabIndex = 1;
             this.tpTimer.Text = "定时打印";
             this.tpTimer.UseVisualStyleBackColor = true;
@@ -614,9 +674,10 @@
             // 
             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(8, 13);
+            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(88, 26);
+            this.label5.Size = new System.Drawing.Size(129, 37);
             this.label5.TabIndex = 56;
             this.label5.Text = "定时打印";
             // 
@@ -635,9 +696,10 @@
             "60s",
             "70s",
             "80s"});
-            this.cbPrintSpan.Location = new System.Drawing.Point(102, 10);
+            this.cbPrintSpan.Location = new System.Drawing.Point(153, 15);
+            this.cbPrintSpan.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.cbPrintSpan.Name = "cbPrintSpan";
-            this.cbPrintSpan.Size = new System.Drawing.Size(106, 34);
+            this.cbPrintSpan.Size = new System.Drawing.Size(157, 45);
             this.cbPrintSpan.TabIndex = 53;
             // 
             // cbPrintCount
@@ -653,17 +715,19 @@
             "200",
             "300",
             "400"});
-            this.cbPrintCount.Location = new System.Drawing.Point(102, 51);
+            this.cbPrintCount.Location = new System.Drawing.Point(153, 76);
+            this.cbPrintCount.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.cbPrintCount.Name = "cbPrintCount";
-            this.cbPrintCount.Size = new System.Drawing.Size(106, 34);
+            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(229, 9);
+            this.btnStart.Location = new System.Drawing.Point(344, 14);
+            this.btnStart.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnStart.Name = "btnStart";
-            this.btnStart.Size = new System.Drawing.Size(90, 35);
+            this.btnStart.Size = new System.Drawing.Size(135, 52);
             this.btnStart.TabIndex = 55;
             this.btnStart.Text = "开始";
             this.btnStart.UseVisualStyleBackColor = true;
@@ -673,9 +737,10 @@
             // 
             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(330, 9);
+            this.btnStop.Location = new System.Drawing.Point(495, 14);
+            this.btnStop.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnStop.Name = "btnStop";
-            this.btnStop.Size = new System.Drawing.Size(90, 35);
+            this.btnStop.Size = new System.Drawing.Size(135, 52);
             this.btnStop.TabIndex = 55;
             this.btnStop.Text = "停止";
             this.btnStop.UseVisualStyleBackColor = true;
@@ -685,9 +750,10 @@
             // 
             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(332, 56);
+            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(24, 26);
+            this.lblLastCount.Size = new System.Drawing.Size(34, 37);
             this.lblLastCount.TabIndex = 59;
             this.lblLastCount.Text = "0";
             // 
@@ -695,9 +761,10 @@
             // 
             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(8, 54);
+            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(88, 26);
+            this.label7.Size = new System.Drawing.Size(129, 37);
             this.label7.TabIndex = 57;
             this.label7.Text = "打印数量";
             // 
@@ -705,35 +772,13 @@
             // 
             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(231, 56);
+            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(88, 26);
+            this.label8.Size = new System.Drawing.Size(129, 37);
             this.label8.TabIndex = 58;
             this.label8.Text = "剩余数量";
             // 
-            // tpManual
-            // 
-            this.tpManual.Controls.Add(this.cbTemplateDesign);
-            this.tpManual.Controls.Add(this.tsbPrint);
-            this.tpManual.Location = new System.Drawing.Point(4, 47);
-            this.tpManual.Name = "tpManual";
-            this.tpManual.Padding = new System.Windows.Forms.Padding(3);
-            this.tpManual.Size = new System.Drawing.Size(437, 95);
-            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(6, 6);
-            this.cbTemplateDesign.Name = "cbTemplateDesign";
-            this.cbTemplateDesign.Size = new System.Drawing.Size(93, 25);
-            this.cbTemplateDesign.TabIndex = 35;
-            this.cbTemplateDesign.Text = "模板调整";
-            this.cbTemplateDesign.UseVisualStyleBackColor = true;
-            // 
             // timer2
             // 
             this.timer2.Enabled = true;
@@ -746,20 +791,21 @@
             this.tabControl1.Controls.Add(this.tabPage2);
             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(4, 4);
+            this.tabControl1.Location = new System.Drawing.Point(6, 6);
-            this.tabControl1.Margin = new System.Windows.Forms.Padding(10, 10, 10, 3);
+            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(681, 607);
+            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, 30);
+            this.tabPage1.Location = new System.Drawing.Point(4, 40);
+            this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tabPage1.Name = "tabPage1";
-            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.tabPage1.Size = new System.Drawing.Size(673, 573);
+            this.tabPage1.Size = new System.Drawing.Size(1014, 866);
             this.tabPage1.TabIndex = 0;
             this.tabPage1.Text = "打印记录";
             this.tabPage1.UseVisualStyleBackColor = true;
@@ -768,10 +814,11 @@
             // 
             this.tabPage2.Controls.Add(this.groupBox4);
             this.tabPage2.Controls.Add(this.groupBox2);
-            this.tabPage2.Location = new System.Drawing.Point(4, 30);
+            this.tabPage2.Location = new System.Drawing.Point(4, 40);
+            this.tabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tabPage2.Name = "tabPage2";
-            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.tabPage2.Size = new System.Drawing.Size(673, 573);
+            this.tabPage2.Size = new System.Drawing.Size(1014, 866);
             this.tabPage2.TabIndex = 1;
             this.tabPage2.Text = "注塑参数扫描";
             this.tabPage2.UseVisualStyleBackColor = true;
@@ -780,9 +827,11 @@
             // 
             this.groupBox4.Controls.Add(this.lvParamRecords);
             this.groupBox4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.groupBox4.Location = new System.Drawing.Point(3, 140);
+            this.groupBox4.Location = new System.Drawing.Point(4, 210);
+            this.groupBox4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.groupBox4.Name = "groupBox4";
-            this.groupBox4.Size = new System.Drawing.Size(667, 430);
+            this.groupBox4.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.groupBox4.Size = new System.Drawing.Size(1006, 652);
             this.groupBox4.TabIndex = 1;
             this.groupBox4.TabStop = false;
             this.groupBox4.Text = "扫描记录";
@@ -794,9 +843,11 @@
             this.lvParamRecords.Dock = System.Windows.Forms.DockStyle.Fill;
             this.lvParamRecords.FullRowSelect = true;
             this.lvParamRecords.GridLines = true;
-            this.lvParamRecords.Location = new System.Drawing.Point(3, 25);
+            this.lvParamRecords.HideSelection = false;
+            this.lvParamRecords.Location = new System.Drawing.Point(4, 36);
+            this.lvParamRecords.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.lvParamRecords.Name = "lvParamRecords";
-            this.lvParamRecords.Size = new System.Drawing.Size(661, 402);
+            this.lvParamRecords.Size = new System.Drawing.Size(998, 612);
             this.lvParamRecords.TabIndex = 0;
             this.lvParamRecords.UseCompatibleStateImageBehavior = false;
             this.lvParamRecords.View = System.Windows.Forms.View.Details;
@@ -819,9 +870,11 @@
             this.groupBox2.Controls.Add(this.txtFilePath);
             this.groupBox2.Controls.Add(this.label4);
             this.groupBox2.Dock = System.Windows.Forms.DockStyle.Top;
-            this.groupBox2.Location = new System.Drawing.Point(3, 3);
+            this.groupBox2.Location = new System.Drawing.Point(4, 4);
+            this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(667, 137);
+            this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.groupBox2.Size = new System.Drawing.Size(1006, 206);
             this.groupBox2.TabIndex = 0;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "参数信息";
@@ -833,18 +886,20 @@
             this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.panel1.Controls.Add(this.picConnectState);
             this.panel1.Controls.Add(this.txtConnectState);
-            this.panel1.Location = new System.Drawing.Point(537, 24);
+            this.panel1.Location = new System.Drawing.Point(812, 36);
+            this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(117, 29);
+            this.panel1.Size = new System.Drawing.Size(174, 42);
             this.panel1.TabIndex = 12;
             // 
             // picConnectState
             // 
             this.picConnectState.BackColor = System.Drawing.SystemColors.Control;
             this.picConnectState.Image = global::QMAPP.WinForm.Resource1.help;
-            this.picConnectState.Location = new System.Drawing.Point(1, 1);
+            this.picConnectState.Location = new System.Drawing.Point(2, 2);
+            this.picConnectState.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.picConnectState.Name = "picConnectState";
-            this.picConnectState.Size = new System.Drawing.Size(25, 25);
+            this.picConnectState.Size = new System.Drawing.Size(38, 38);
             this.picConnectState.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
             this.picConnectState.TabIndex = 2;
             this.picConnectState.TabStop = false;
@@ -853,28 +908,31 @@
             // 
             this.txtConnectState.BackColor = System.Drawing.SystemColors.Control;
             this.txtConnectState.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            this.txtConnectState.Location = new System.Drawing.Point(32, 3);
+            this.txtConnectState.Location = new System.Drawing.Point(48, 4);
+            this.txtConnectState.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtConnectState.Name = "txtConnectState";
             this.txtConnectState.ReadOnly = true;
-            this.txtConnectState.Size = new System.Drawing.Size(80, 22);
+            this.txtConnectState.Size = new System.Drawing.Size(120, 32);
             this.txtConnectState.TabIndex = 11;
             // 
             // txtLastScanTime
             // 
             this.txtLastScanTime.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtLastScanTime.Location = new System.Drawing.Point(537, 61);
+            this.txtLastScanTime.Location = new System.Drawing.Point(812, 92);
+            this.txtLastScanTime.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtLastScanTime.Name = "txtLastScanTime";
             this.txtLastScanTime.ReadOnly = true;
-            this.txtLastScanTime.Size = new System.Drawing.Size(117, 29);
+            this.txtLastScanTime.Size = new System.Drawing.Size(174, 39);
             this.txtLastScanTime.TabIndex = 8;
             // 
             // label14
             // 
             this.label14.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.label14.AutoSize = true;
-            this.label14.Location = new System.Drawing.Point(452, 64);
+            this.label14.Location = new System.Drawing.Point(684, 96);
+            this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label14.Name = "label14";
-            this.label14.Size = new System.Drawing.Size(90, 21);
+            this.label14.Size = new System.Drawing.Size(134, 31);
             this.label14.TabIndex = 7;
             this.label14.Text = "扫描时间：";
             // 
@@ -882,18 +940,20 @@
             // 
             this.txtMessage.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtMessage.Location = new System.Drawing.Point(73, 97);
+            this.txtMessage.Location = new System.Drawing.Point(110, 146);
+            this.txtMessage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtMessage.Name = "txtMessage";
             this.txtMessage.ReadOnly = true;
-            this.txtMessage.Size = new System.Drawing.Size(581, 29);
+            this.txtMessage.Size = new System.Drawing.Size(876, 39);
             this.txtMessage.TabIndex = 6;
             // 
             // label12
             // 
             this.label12.AutoSize = true;
-            this.label12.Location = new System.Drawing.Point(21, 100);
+            this.label12.Location = new System.Drawing.Point(32, 150);
+            this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label12.Name = "label12";
-            this.label12.Size = new System.Drawing.Size(58, 21);
+            this.label12.Size = new System.Drawing.Size(86, 31);
             this.label12.TabIndex = 5;
             this.label12.Text = "消息：";
             // 
@@ -901,18 +961,20 @@
             // 
             this.txtCurrentFile.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtCurrentFile.Location = new System.Drawing.Point(73, 61);
+            this.txtCurrentFile.Location = new System.Drawing.Point(110, 92);
+            this.txtCurrentFile.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtCurrentFile.Name = "txtCurrentFile";
             this.txtCurrentFile.ReadOnly = true;
-            this.txtCurrentFile.Size = new System.Drawing.Size(358, 29);
+            this.txtCurrentFile.Size = new System.Drawing.Size(541, 39);
             this.txtCurrentFile.TabIndex = 6;
             // 
             // label13
             // 
             this.label13.AutoSize = true;
-            this.label13.Location = new System.Drawing.Point(6, 65);
+            this.label13.Location = new System.Drawing.Point(9, 98);
+            this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label13.Name = "label13";
-            this.label13.Size = new System.Drawing.Size(74, 21);
+            this.label13.Size = new System.Drawing.Size(110, 31);
             this.label13.TabIndex = 5;
             this.label13.Text = "文件名：";
             // 
@@ -920,9 +982,10 @@
             // 
             this.label11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.label11.AutoSize = true;
-            this.label11.Location = new System.Drawing.Point(453, 27);
+            this.label11.Location = new System.Drawing.Point(686, 40);
+            this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label11.Name = "label11";
-            this.label11.Size = new System.Drawing.Size(90, 21);
+            this.label11.Size = new System.Drawing.Size(134, 31);
             this.label11.TabIndex = 3;
             this.label11.Text = "连接状态：";
             // 
@@ -930,30 +993,33 @@
             // 
             this.txtFilePath.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtFilePath.Location = new System.Drawing.Point(73, 24);
+            this.txtFilePath.Location = new System.Drawing.Point(110, 36);
+            this.txtFilePath.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtFilePath.Name = "txtFilePath";
             this.txtFilePath.ReadOnly = true;
-            this.txtFilePath.Size = new System.Drawing.Size(358, 29);
+            this.txtFilePath.Size = new System.Drawing.Size(541, 39);
             this.txtFilePath.TabIndex = 1;
             // 
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(21, 27);
+            this.label4.Location = new System.Drawing.Point(32, 40);
+            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(58, 21);
+            this.label4.Size = new System.Drawing.Size(86, 31);
             this.label4.TabIndex = 0;
             this.label4.Text = "路径：";
             // 
             // InjectionCodePrint
             // 
-            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(1140, 615);
+            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, 4, 4, 4);
             this.Name = "InjectionCodePrint";
-            this.Padding = new System.Windows.Forms.Padding(4);
+            this.Padding = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             this.Text = "注塑条码打印";
             this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.InjectionCodePrint_FormClosed);
@@ -971,10 +1037,10 @@
             this.tpPrintMode.ResumeLayout(false);
             this.tpOnline.ResumeLayout(false);
             this.tpOnline.PerformLayout();
-            this.tpTimer.ResumeLayout(false);
-            this.tpTimer.PerformLayout();
             this.tpManual.ResumeLayout(false);
             this.tpManual.PerformLayout();
+            this.tpTimer.ResumeLayout(false);
+            this.tpTimer.PerformLayout();
             this.tabControl1.ResumeLayout(false);
             this.tabPage1.ResumeLayout(false);
             this.tabPage2.ResumeLayout(false);

APPQ5/QMAPP.WinForm/Forms/Injection/InjectionCodePrint.resx

@@ -133,6 +133,6 @@
     <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>
+    <value>270</value>
   </metadata>
 </root>

APPQ5/QMAPP.WinForm/Forms/Injection/SewingPrint.Designer.cs

@@ -29,12 +29,12 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = 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();
@@ -81,14 +81,14 @@
             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;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.DGView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
+            this.DGView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
             this.DGView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.DGView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.MAINCODE,
@@ -100,14 +100,14 @@
             this.DGView.Margin = new System.Windows.Forms.Padding(4);
             this.DGView.Name = "DGView";
             this.DGView.ReadOnly = true;
-            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle12.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.DGView.RowHeadersDefaultCellStyle = dataGridViewCellStyle12;
+            this.DGView.RowHeadersDefaultCellStyle = dataGridViewCellStyle6;
             this.DGView.RowTemplate.Height = 23;
             this.DGView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
             this.DGView.Size = new System.Drawing.Size(1006, 858);
@@ -117,8 +117,8 @@
             // 
             this.MAINCODE.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.MAINCODE.DataPropertyName = "MAINCODE";
-            dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 15.75F);
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 15.75F);
-            this.MAINCODE.DefaultCellStyle = dataGridViewCellStyle8;
+            this.MAINCODE.DefaultCellStyle = dataGridViewCellStyle2;
             this.MAINCODE.FillWeight = 48.95314F;
             this.MAINCODE.HeaderText = "条码信息";
             this.MAINCODE.Name = "MAINCODE";
@@ -129,8 +129,8 @@
             // 
             this.MATERIAL_NAME.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.MATERIAL_NAME.DataPropertyName = "MATERIAL_NAME";
-            dataGridViewCellStyle9.Font = new System.Drawing.Font("宋体", 15.75F);
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 15.75F);
-            this.MATERIAL_NAME.DefaultCellStyle = dataGridViewCellStyle9;
+            this.MATERIAL_NAME.DefaultCellStyle = dataGridViewCellStyle3;
             this.MATERIAL_NAME.FillWeight = 99.90437F;
             this.MATERIAL_NAME.HeaderText = "零件名称";
             this.MATERIAL_NAME.Name = "MATERIAL_NAME";
@@ -141,8 +141,8 @@
             // 
             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)));
+            dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PRODUCTCODE.DefaultCellStyle = dataGridViewCellStyle10;
+            this.PRODUCTCODE.DefaultCellStyle = dataGridViewCellStyle4;
             this.PRODUCTCODE.FillWeight = 48.95314F;
             this.PRODUCTCODE.HeaderText = "零件号";
             this.PRODUCTCODE.Name = "PRODUCTCODE";
@@ -153,11 +153,11 @@
             // 
             this.CREATETIME.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.CREATETIME.DataPropertyName = "CREATETIME";
-            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            dataGridViewCellStyle11.Font = new System.Drawing.Font("宋体", 15.75F);
+            dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 15.75F);
-            dataGridViewCellStyle11.Format = "f";
+            dataGridViewCellStyle5.Format = "f";
-            dataGridViewCellStyle11.NullValue = null;
+            dataGridViewCellStyle5.NullValue = null;
-            this.CREATETIME.DefaultCellStyle = dataGridViewCellStyle11;
+            this.CREATETIME.DefaultCellStyle = dataGridViewCellStyle5;
             this.CREATETIME.FillWeight = 48.95314F;
             this.CREATETIME.HeaderText = "操作时间";
             this.CREATETIME.Name = "CREATETIME";
@@ -411,7 +411,6 @@
             // 
             // 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);

APPQ5/QMAPP.WinForm/Forms/Injection/SewingPrint.cs

@@ -433,7 +433,7 @@ namespace QMAPP.WinForm.Forms.Injection
             tsbPrint.Enabled = false;
             //btnChoiceMaterial.Enabled = false;
             //groupBox3.Enabled = false;
-            printtimer = int.Parse(cbPrintSpan.Text.Trim('s'));
+            //printtimer = int.Parse(cbPrintSpan.Text.Trim('s'));
             LockPrintMode(2);
 
         }
@@ -441,7 +441,7 @@ namespace QMAPP.WinForm.Forms.Injection
         private void btnStop_Click(object sender, EventArgs e)
         {
             btnStart.Enabled = true;
-            btnStop.Enabled = false;
+            btnStop.Enabled = true;
             cbPrintCount.Enabled = true;
             cbPrintSpan.Enabled = true;
             //lblLastCount.Text = cbPrintCount.Text;
@@ -455,13 +455,13 @@ namespace QMAPP.WinForm.Forms.Injection
 
         private void timer2_Tick(object sender, EventArgs e)
         {
-            if (!btnStart.Enabled&&btnStop.Enabled)
+            if (!btnStart.Enabled)
             {
                 int span=int.Parse(cbPrintSpan.Text.Trim('s'));
                 if (printtimer >= span)
                 {
-                    CodeCreatePrint();
                     printtimer = 0;
+                    CodeCreatePrint();
                     var lastcount = int.Parse(lblLastCount.Text) - 1;
                     lblLastCount.Text = lastcount + "";
                     if (lastcount <= 0)

APPQ5/QMAPP.WinForm/Forms/Injection/SewingPrint.resx

@@ -133,6 +133,6 @@
     <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>
+    <value>176</value>
   </metadata>
 </root>

APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs

@@ -2202,28 +2202,38 @@ namespace QMAPP.WinForm.Forms.TianJin
 
             #region 针对贴车单上的条码进行出库操作
 
+            var nor = string.Empty;
             for (var i = 0; i < tbl.Rows.Count; i++)
             {
-                var count = agent.InvokeServiceFunction<DataResult<int>>("StorageBLL_SelectCount", tbl.Rows[i]["VIN"].ToString());
+                if (string.IsNullOrEmpty(nor))
-
+                    nor += tbl.Rows[i]["VIN"].ToString() + ",";
-                //如果条码未入库，先进行入库操作
+                else
-                if (count.Result <= 0)
                 {
-                    Storage pi = new Storage();
+                    if (!nor.Contains(tbl.Rows[i]["VIN"].ToString()))
-                    pi.ProductCode = tbl.Rows[i]["VIN"].ToString();
+                    {
-                    pi.InStorageType = "发运入库";
+                        var count = agent.InvokeServiceFunction<DataResult<int>>("StorageBLL_SelectCount", tbl.Rows[i]["VIN"].ToString());
 
-                     agent.InvokeServiceFunction<DataResult<int>>("StorageBLL_Insert", pi);
+                        //如果条码未入库，先进行入库操作
-                }
+                        if (count.Result <= 0)
+                        {
+                            Storage pi = new Storage();
+                            pi.ProductCode = tbl.Rows[i]["VIN"].ToString();
+                            pi.InStorageType = "发运入库";
 
-                var storage = new Storage();
+                            agent.InvokeServiceFunction<DataResult<int>>("StorageBLL_Insert", pi);
-                storage.ProductCode = tbl.Rows[i]["VIN"].ToString();
+                        }
-                storage.OutStorageType = "发运出库";
+
-                var result = agent.InvokeServiceFunction<DataResult>("StorageBLL_Update", storage);
+                        var storage = new Storage();
-                if (!result.IsSuccess)
+                        storage.ProductCode = tbl.Rows[i]["VIN"].ToString();
-                {
+                        storage.OutStorageType = "发运出库";
-                    lberror.Text += tbl.Rows[i]["VIN"].ToString() + "出库失败;原因:" + result.Msg; ;
+                        var result = agent.InvokeServiceFunction<DataResult>("StorageBLL_Update", storage);
+                        if (!result.IsSuccess)
+                        {
+                            lberror.Text += tbl.Rows[i]["VIN"].ToString() + "出库失败;原因:" + result.Msg; ;
+                        }
+                    }
                 }
+                
             }
             
 

APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2024.01.24.01")]
+[assembly: AssemblyVersion("2024.01.30.01")]
-[assembly: AssemblyFileVersion("2024.01.24.01")]
+[assembly: AssemblyFileVersion("2024.01.30.01")]

AppCommon/QMAPP.ServicesAgent/ServiceEnums.cs

@@ -2239,6 +2239,10 @@ namespace QMAPP.ServicesAgent
 
         [Description("通过总成条码获取产品")]
         FrmPlaceBLL_GetProductByAssembleCode,
+
+        [Description("通过总成条码获取产品")]
+        FrmPlaceBLL_GetProductByAssembleCodeMP4,
+
         FrmPlaceBLL_GetTimeOutSet,
 
     }

ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config

@@ -66,28 +66,27 @@
     <!--
     <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="maindbBC316_MP4" connectionString="Data Source=10.111.144.111;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=123u3M12912@1;" 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="maindb" connectionString="Data Source=10.111.144.111;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=123u3M12912@1;" 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="maindbBZD" connectionString="Data Source=10.111.144.111;Initial Catalog=BZD;User Id=CDMESADM;Password=123u3M12912@1;" 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"/>-->
 
+    <!-- 
+    <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.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.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"/>-->