增加018D打印及发运

APP/QMAPP.Web/App_Data/Menu.xml

@@ -298,7 +298,7 @@
     </Actions>
   </MenuItem>-->
   <!--TJDoorPlankPlanPrint   DoorPlankPlan-->
-  <MenuItem MenuID="02030000" SystemID="FJC" MenuDes="门板计划管理"   Action="/TJDoorPlankPlanPrint/List?ORDER_TYPE=DOORPLANK" Target="url" PowerID="CD02030000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="02000000" Seq="1">
+  <MenuItem MenuID="02030000" SystemID="FJC" MenuDes="TJ门板计划管理"   Action="/TJDoorPlankPlanPrint/List?ORDER_TYPE=DOORPLANK" Target="url" PowerID="CD02030000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="02000000" Seq="1">
     <Actions>
       <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="List" PowerID="CD02030001">查询</Action>
       <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="Add" PowerID="CD02030002">添加</Action>
@@ -313,6 +313,21 @@
       <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="TemplateExcel" PowerID="CD02030010">下载模板</Action>
     </Actions>
   </MenuItem>
+  <!--<MenuItem MenuID="02030000" SystemID="FJC" MenuDes="门板计划管理"   Action="/DoorPlankPlan/List?ORDER_TYPE=DOORPLANK" Target="url" PowerID="CD02030000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="02000000" Seq="1">
+    <Actions>
+      <Action ContorllerName="DoorPlankPlan" ActionName="List" PowerID="CD02030001">查询</Action>
+      <Action ContorllerName="DoorPlankPlan" ActionName="Add" PowerID="CD02030002">添加</Action>
+      <Action ContorllerName="DoorPlankPlan" ActionName="AddWholeDoor" PowerID="CD02030003">整车添加</Action>
+      <Action ContorllerName="DoorPlankPlan" ActionName="Edit" PowerID="CD02030004">修改</Action>
+      <Action ContorllerName="DoorPlankPlan" ActionName="EditDoorPlankPlanSeq" PowerID="CD02030011">修改计划顺序号</Action>
+      <Action ContorllerName="DoorPlankPlan" ActionName="Insert" PowerID="CD02030005">插单</Action>
+      <Action ContorllerName="DoorPlankPlan" ActionName="Delete" PowerID="CD02030006">删除</Action>
+      <Action ContorllerName="DoorPlankPlan" ActionName="PutOut" PowerID="CD02030007">发布</Action>
+      <Action ContorllerName="DoorPlankPlan" ActionName="ImportExcel" PowerID="CD02030008">导入</Action>
+      <Action ContorllerName="DoorPlankPlan" ActionName="ExportExcel" PowerID="CD02030009">导出</Action>
+      <Action ContorllerName="DoorPlankPlan" ActionName="TemplateExcel" PowerID="CD02030010">下载模板</Action>
+    </Actions>
+  </MenuItem>-->
   
   <MenuItem MenuID="02040000" SystemID="FJC" MenuDes="仪表板计划管理"   Action="/DashBoardPlan/List?ORDER_TYPE=DASHBOARD" Target="url" PowerID="CD02040000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="02000000" Seq="1">
     <Actions>

APP/QMAPP.Web/Web.config

@@ -51,10 +51,12 @@
     -->
     <!--<add name="maindb" connectionString="Data Source=119.3.213.202,13315;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=ChangkeTec@2020;" providerName="System.Data.SqlClient"/>-->
 
-
+ <!--
-    <add name="maindb" connectionString="Data Source=10.111.144.98;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.98;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;" 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_TJ_MES;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>-->
 

APPMD/QMAPP.MD.Web/Web.config

@@ -31,8 +31,10 @@
     <!--<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=10.111.144.98;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.98;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;" 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=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"/>

APPQ5/QMAPP.FJC.BLL/Andon/AndonCallBLL.cs

@@ -715,8 +715,6 @@ namespace QMAPP.FJC.BLL.Andon
             {
                 try
                 {
-                    
-
                     AndonCallDAL andonDal = new AndonCallDAL();
                     andonDal.BaseSession = session;
 

APPQ5/QMAPP.FJC.BLL/TianJin/TJWorkOrderBLL.cs

@@ -108,6 +108,30 @@ namespace QMAPP.FJC.BLL.TianJin
             }
         }
 
+        public List<WorkOrder> GetOrderUnPrinted018DF(string RouteCode, int filter, DataPage dataPage, string Direction, string SHIFTCODE, string BeginTime, string EndTime)
+        {
+            try
+            {
+                return new TWorkOrderDAL().GetOrderUnPrinted018DF(RouteCode, Direction, SHIFTCODE, BeginTime, EndTime, filter, dataPage.PageSize);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        public List<WorkOrder> GetOrderUnPrinted018DR(string RouteCode, int filter, DataPage dataPage, string Direction, string SHIFTCODE, string BeginTime, string EndTime)
+        {
+            try
+            {
+                return new TWorkOrderDAL().GetOrderUnPrinted018DR(RouteCode, Direction, SHIFTCODE, BeginTime, EndTime, filter, dataPage.PageSize);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
         public int SetOrderPrinted(string orderpid)
         {
             try

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

@@ -46,10 +46,18 @@ namespace QMAPP.FJC.DAL.TianJin
                 {
                     strSql.Append(" WHERE  O.MOULD_CODE IN( 'LF', 'LR' )   ");
                 }
-                else
+                else if(!string.IsNullOrEmpty(pFistype) && pFistype == "02")
                 {
                     strSql.Append(" WHERE  O.MOULD_CODE IN( 'RF', 'RR' )   ");
                 }
+                else if (!string.IsNullOrEmpty(pFistype) && pFistype == "03")
+                {
+                    strSql.Append(" WHERE  O.MOULD_CODE IN( 'LF', 'RF' )   ");
+                }
+                else if (!string.IsNullOrEmpty(pFistype) && pFistype == "04")
+                {
+                    strSql.Append(" WHERE  O.MOULD_CODE IN( 'LR', 'RR' )   ");
+                }
 
                 strSql.Append(" and O.STATE in ('0','1') ");
 

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

@@ -415,6 +415,196 @@ namespace QMAPP.FJC.DAL.TianJin
             }
         }
 
+        /// <summary>
+        /// 获取指定工序的生产计划清单---018D前门
+        /// </summary>
+        /// <param name="workcellcode">工序编码</param>
+        /// <param name="count">数量</param>
+        /// <param name="filter">过滤选项：0全部；1隐藏挂起；2只看挂起</param>
+        /// <returns></returns>
+        public List<WorkOrder> GetOrderUnPrinted018DF(string routecode, string Direction, string SHIFTCODE, string BeginTime, string EndTime, int filter = 0, int count = 20)
+        {
+            try
+            {
+                StringBuilder sql = new StringBuilder();
+                sql.AppendFormat("SELECT TOP {0} W.[PID]\r\n", count);
+                sql.AppendFormat("      ,W.[ORDERPLANID] ");
+                sql.AppendFormat("      ,W.[ORDERPLAN_NO] ");
+                sql.AppendFormat("      ,W.[ORDER_TYPE] ");
+                sql.AppendFormat("      ,W.[SEQ] ");
+                sql.AppendFormat("      ,W.[MATERIAL_CODE] ");
+                sql.AppendFormat(" 	    ,M.[MATERIAL_NAME] ");
+                sql.AppendFormat("      ,W.[PBOM_CODE] ");
+                sql.AppendFormat("      ,W.[QTY] ");
+                sql.AppendFormat("      ,W.[COMPLETE_QTY] ");
+                sql.AppendFormat("      ,W.[PLAN_DATE] ");
+                sql.AppendFormat("      ,W.[SHIFT_CODE] ");
+                sql.AppendFormat("      ,W.[WORKCENTER_CODE] ");
+                sql.AppendFormat("      ,W.[WORKCENTER_NAME] ");
+                sql.AppendFormat("      ,W.[WORKCELL_CODE] ");
+                sql.AppendFormat("      ,W.[WORKCELL_NAME] ");
+                sql.AppendFormat("      ,W.[WORKLOC_CODE] ");
+                sql.AppendFormat("      ,W.[REMARK] ");
+                sql.AppendFormat("      ,W.[EQPT_NAME] ");
+                sql.AppendFormat("      ,W.[EQPT_CODE] ");
+                sql.AppendFormat("      ,W.[STATE] ");
+                sql.AppendFormat("      ,W.[MOULD_CODE] ");
+                sql.AppendFormat("      ,W.[PRI] ");
+                sql.AppendFormat("      ,W.[UPDATEDATE] ");
+                sql.AppendFormat("      ,W.[PRINTED] ");
+                sql.AppendFormat("      ,P.[IGNORE_FISBREAK] ");
+                sql.AppendFormat("      ,P.[FIS_ASMSETCODE] ");
+                sql.AppendFormat("  FROM [T_PP_WORKORDER] AS W WITH(NOLOCK) ");
+                sql.AppendFormat("  LEFT JOIN [T_PP_ORDERPLAN] AS P WITH(NOLOCK) ");
+                sql.AppendFormat("    ON P.[PID]=W.[ORDERPLANID] ");
+                sql.AppendFormat("  LEFT JOIN [T_MD_MATERIAL] AS M WITH(NOLOCK) ");
+                sql.AppendFormat("    ON W.[MATERIAL_CODE]=M.[MATERIAL_CODE] ");
+                if (Direction == "左")
+                    sql.AppendFormat($" WHERE P.[ROUTE_CODE]='DP_L_ASSEMBLY_770B' ");
+                else
+                    sql.AppendFormat($" WHERE P.[ROUTE_CODE]='DP_R_ASSEMBLY_770B' ");
+                sql.AppendFormat("   AND W.[PRINTED]='0' ");
+
+                if (!string.IsNullOrEmpty(Direction))
+                {
+                    sql.AppendFormat($" AND M.[MATERIAL_NAME] LIKE '%{Direction}前%' ");
+                }
+                if (!string.IsNullOrEmpty(SHIFTCODE))
+                {
+                    sql.AppendFormat($" AND W.[SHIFT_CODE] = '{SHIFTCODE}' ");
+                }
+                if (BeginTime != DateTime.MinValue.ToString())
+                {
+                    sql.AppendFormat($" AND W.[PLAN_DATE] >= '{Convert.ToDateTime(BeginTime).ToString("yyyy-MM-dd")} 00:00:00' ");
+                }
+                if (EndTime != DateTime.MinValue.ToString())
+                {
+                    sql.AppendFormat($" AND W.[PLAN_DATE] <= '{Convert.ToDateTime(EndTime).ToString("yyyy-MM-dd")} 23:59:59' ");
+                }
+
+                switch (filter)
+                {
+                    case 1:
+                        {
+                            sql.AppendFormat(" AND W.[STATE]<>4 ");
+                            break;
+                        }
+                    case 2:
+                        {
+                            sql.AppendFormat(" AND W.[STATE]=4 ");
+                            break;
+                        }
+                }
+                sql.AppendFormat(" ORDER BY W.[UPDATEDATE],W.[PRI],W.[PLAN_DATE],W.[ORDERPLAN_NO],P.PLAN_SEQ,W.[SEQ],W.[MATERIAL_CODE] ");
+                List<DataParameter> parameters = new List<DataParameter>();
+                parameters.Add(new DataParameter("routecode", routecode));
+                using (var session = AppDataFactory.CreateMainSession())
+                {
+                    return session.GetList<WorkOrder>(sql.ToString(), parameters.ToArray()).ToList();
+                }
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+        /// <summary>
+        /// 获取指定工序的生产计划清单---018D后门
+        /// </summary>
+        /// <param name="workcellcode">工序编码</param>
+        /// <param name="count">数量</param>
+        /// <param name="filter">过滤选项：0全部；1隐藏挂起；2只看挂起</param>
+        /// <returns></returns>
+        public List<WorkOrder> GetOrderUnPrinted018DR(string routecode, string Direction, string SHIFTCODE, string BeginTime, string EndTime, int filter = 0, int count = 20)
+        {
+            try
+            {
+                StringBuilder sql = new StringBuilder();
+                sql.AppendFormat("SELECT TOP {0} W.[PID]\r\n", count);
+                sql.AppendFormat("      ,W.[ORDERPLANID] ");
+                sql.AppendFormat("      ,W.[ORDERPLAN_NO] ");
+                sql.AppendFormat("      ,W.[ORDER_TYPE] ");
+                sql.AppendFormat("      ,W.[SEQ] ");
+                sql.AppendFormat("      ,W.[MATERIAL_CODE] ");
+                sql.AppendFormat(" 	    ,M.[MATERIAL_NAME] ");
+                sql.AppendFormat("      ,W.[PBOM_CODE] ");
+                sql.AppendFormat("      ,W.[QTY] ");
+                sql.AppendFormat("      ,W.[COMPLETE_QTY] ");
+                sql.AppendFormat("      ,W.[PLAN_DATE] ");
+                sql.AppendFormat("      ,W.[SHIFT_CODE] ");
+                sql.AppendFormat("      ,W.[WORKCENTER_CODE] ");
+                sql.AppendFormat("      ,W.[WORKCENTER_NAME] ");
+                sql.AppendFormat("      ,W.[WORKCELL_CODE] ");
+                sql.AppendFormat("      ,W.[WORKCELL_NAME] ");
+                sql.AppendFormat("      ,W.[WORKLOC_CODE] ");
+                sql.AppendFormat("      ,W.[REMARK] ");
+                sql.AppendFormat("      ,W.[EQPT_NAME] ");
+                sql.AppendFormat("      ,W.[EQPT_CODE] ");
+                sql.AppendFormat("      ,W.[STATE] ");
+                sql.AppendFormat("      ,W.[MOULD_CODE] ");
+                sql.AppendFormat("      ,W.[PRI] ");
+                sql.AppendFormat("      ,W.[UPDATEDATE] ");
+                sql.AppendFormat("      ,W.[PRINTED] ");
+                sql.AppendFormat("      ,P.[IGNORE_FISBREAK] ");
+                sql.AppendFormat("      ,P.[FIS_ASMSETCODE] ");
+                sql.AppendFormat("  FROM [T_PP_WORKORDER] AS W WITH(NOLOCK) ");
+                sql.AppendFormat("  LEFT JOIN [T_PP_ORDERPLAN] AS P WITH(NOLOCK) ");
+                sql.AppendFormat("    ON P.[PID]=W.[ORDERPLANID] ");
+                sql.AppendFormat("  LEFT JOIN [T_MD_MATERIAL] AS M WITH(NOLOCK) ");
+                sql.AppendFormat("    ON W.[MATERIAL_CODE]=M.[MATERIAL_CODE] ");
+                if (Direction == "左")
+                    sql.AppendFormat($" WHERE P.[ROUTE_CODE]='DP_L_ASSEMBLY_770B' ");
+                else
+                    sql.AppendFormat($" WHERE P.[ROUTE_CODE]='DP_R_ASSEMBLY_770B' ");
+
+                sql.AppendFormat("   AND W.[PRINTED]='0' ");
+
+                if (!string.IsNullOrEmpty(Direction))
+                {
+                    sql.AppendFormat($" AND M.[MATERIAL_NAME] LIKE '%{Direction}后%' ");
+                }
+                if (!string.IsNullOrEmpty(SHIFTCODE))
+                {
+                    sql.AppendFormat($" AND W.[SHIFT_CODE] = '{SHIFTCODE}' ");
+                }
+                if (BeginTime != DateTime.MinValue.ToString())
+                {
+                    sql.AppendFormat($" AND W.[PLAN_DATE] >= '{Convert.ToDateTime(BeginTime).ToString("yyyy-MM-dd")} 00:00:00' ");
+                }
+                if (EndTime != DateTime.MinValue.ToString())
+                {
+                    sql.AppendFormat($" AND W.[PLAN_DATE] <= '{Convert.ToDateTime(EndTime).ToString("yyyy-MM-dd")} 23:59:59' ");
+                }
+
+                switch (filter)
+                {
+                    case 1:
+                        {
+                            sql.AppendFormat(" AND W.[STATE]<>4 ");
+                            break;
+                        }
+                    case 2:
+                        {
+                            sql.AppendFormat(" AND W.[STATE]=4 ");
+                            break;
+                        }
+                }
+                sql.AppendFormat(" ORDER BY W.[UPDATEDATE],W.[PRI],W.[PLAN_DATE],W.[ORDERPLAN_NO],P.PLAN_SEQ,W.[SEQ],W.[MATERIAL_CODE] ");
+                List<DataParameter> parameters = new List<DataParameter>();
+                parameters.Add(new DataParameter("routecode", routecode));
+                using (var session = AppDataFactory.CreateMainSession())
+                {
+                    return session.GetList<WorkOrder>(sql.ToString(), parameters.ToArray()).ToList();
+                }
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+
         /// <summary>
         /// 获取指定工序的待完成计划数量
         /// </summary>

APPQ5/QMAPP.FJC.Web/Web.config

@@ -41,9 +41,9 @@
 -->
     <!--<add name="maindb" connectionString="Data Source=119.3.213.202,13315;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=ChangkeTec@2020;" providerName="System.Data.SqlClient"/>-->
 
-    <add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=CDmes123;" 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="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=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;max pool size=10240;" 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"/>-->

APPQ5/QMAPP.WinForm/App.config

@@ -2,11 +2,11 @@
 <configuration>
   <connectionStrings>
     <!--主数据库连接-->
-
+    <!--
 
     <add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
     <add name="maindbBZD" connectionString="Data Source=10.111.144.98;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
-    <!--
+   
    <add name="maindb" connectionString="Data Source=10.111.144.99;Initial Catalog=ADIENT_CD_MES;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"/>-->
 
@@ -19,11 +19,13 @@
     <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"/>
     -->
     <!--<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"/>-->
 
+    <add name="maindb" connectionString="Data Source=123.56.115.74;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=qwe123$%^;" providerName="System.Data.SqlClient" />
+    
   </connectionStrings>
 
   <appSettings>

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

@@ -348,7 +348,7 @@ namespace QMAPP.WinForm.Forms.TianJin
             try
             {
                 timeRefew.Enabled = true;
-                //UserBuffer.Interval = CtlApp.GetInterval(QM.Config.CustomConfig.GetItem("RefreshTime"));
+                //UserBuffer.Interval = CtlApp.GetInterval(QM.Convvvvvvvvvvvn'n'n'n'n'n'n'n'n'n'n'n'n'n'n'n'n'n'nfig.CustomConfig.GetItem("RefreshTime"));
                 UserBuffer.Interval = CtlApp.GetInterval(QMAPP.WinForm.Common.LocalSetting.Settings["RefreshTime","20"]);
                 timeRefew.Interval = UserBuffer.Interval;
                 //BarcodeTime = int.Parse(QM.Config.CustomConfig.GetItem("BarcodeTime"));
@@ -366,12 +366,20 @@ namespace QMAPP.WinForm.Forms.TianJin
                 if (!string.IsNullOrEmpty(pFisType))
                 {
                     if (pFisType.Equals("01"))
+                    {
+                        rb_hx.Checked = true;
+                    }
+                    else if(pFisType.Equals("02"))
                     {
                         rb_dx.Checked = true;
                     }
+                    else if (pFisType.Equals("03"))
+                    {
+                        ra_hx.Checked = true;
+                    }
                     else
                     {
-                        rb_dx.Checked = true;
+                        ra_dx.Checked = true;
                     }
                 }
 
@@ -776,6 +784,14 @@ namespace QMAPP.WinForm.Forms.TianJin
                         {
                             strprodtype = "( 右 )";
                         }
+                        else if (pFisType == "03")
+                        {
+                            strprodtype = "( 前 )";
+                        }
+                        else if (pFisType == "04")
+                        {
+                            strprodtype = "( 后 )";
+                        }
                         //提交数据处理
                         foreach (DataRow dr in tbl.Rows)
                         {
@@ -987,12 +1003,20 @@ namespace QMAPP.WinForm.Forms.TianJin
                 //#region "隐藏了rb_hx 和rb_dx，全部根据pFisType判断，生产线的设置使用按钮进行设置"
                 if (pFisType == "01")
                 {
-                    strprodtype = "( 混 )";
+                    strprodtype = "( 左 )";
                 }
                 else if (pFisType == "02")
                 {
-                    strprodtype = "( 单 )";
+                    strprodtype = "( 右 )";
                }
+                else if (pFisType == "03")
+                {
+                    strprodtype = "( 前 )";
+                }
+                else if (pFisType == "04")
+                {
+                    strprodtype = "( 后 )";
+                }
                 prin.Print(rowindex, nfpastecard, strprodtype);
                 ClearContainer();
                 GetInitData();
@@ -1195,31 +1219,59 @@ namespace QMAPP.WinForm.Forms.TianJin
                             plan.LINENO = "770B";
                         else
                             plan.LINENO = "018D";
-                        foreach (var s in "R,F".Split(','))
+                        if (plan.LINENO == "770B")
                         {
-                            plan.PID = Guid.NewGuid().ToString();
+                            foreach (var s in "R,F".Split(','))
+                            {
+                                plan.PID = Guid.NewGuid().ToString();
 
-                            plan.MATERIAL_CODE = mach.Substring(0, mach.Length - 1) + s + mach.Substring(mach.Length - 1,1);
+                                plan.MATERIAL_CODE = mach.Substring(0, mach.Length - 1) + s + mach.Substring(mach.Length - 1, 1);
 
-                            foreach (var rule in _barcodeRules)
+                                foreach (var rule in _barcodeRules)
-                            {
-                                if (System.Text.RegularExpressions.Regex.IsMatch(plan.MATERIAL_CODE + "1", rule.REGEX))
                                 {
-                                    plan.MATERIAL_CODE = rule.MATERIAL_CODE;
+                                    if (System.Text.RegularExpressions.Regex.IsMatch(plan.MATERIAL_CODE + "1", rule.REGEX))
+                                    {
+                                        plan.MATERIAL_CODE = rule.MATERIAL_CODE;
+                                    }
+                                }
 
+                                var RESULT = agent.InvokeServiceFunction<DataResult<int>>("TJDoorPlankPlanBLL_Insert", plan);
+                                if (RESULT.IsSuccess == true)
+                                {
+                                    agent.InvokeServiceFunction<DataResult<int>>("TJDoorPlankPlanBLL_PutOut", plan.PID);
                                 }
                             }
-                            
+                        }
-                            var RESULT = agent.InvokeServiceFunction<DataResult<int>>("TJDoorPlankPlanBLL_Insert", plan);
+                        else
-                            if (RESULT.IsSuccess == true)
+                        {
+                            foreach (var s in "L,R".Split(','))
                             {
-                                agent.InvokeServiceFunction<DataResult<int>>("TJDoorPlankPlanBLL_PutOut", plan.PID);
+                                plan.PID = Guid.NewGuid().ToString();
+                                plan.MATERIAL_CODE = mach.Substring(0, mach.Length - 1) + mach.Substring(mach.Length - 1, 1) + s;
+
+                                foreach (var rule in _barcodeRules)
+                                {
+                                    if (System.Text.RegularExpressions.Regex.IsMatch(plan.MATERIAL_CODE + "1", rule.REGEX))
+                                    {
+                                        plan.MATERIAL_CODE = rule.MATERIAL_CODE;
+                                    }
+                                }
+
+                                var RESULT = agent.InvokeServiceFunction<DataResult<int>>("TJDoorPlankPlanBLL_Insert", plan);
+                                if (RESULT.IsSuccess == true)
+                                {
+                                    agent.InvokeServiceFunction<DataResult<int>>("TJDoorPlankPlanBLL_PutOut", plan.PID);
+                                }
                             }
                         }
+                        txtCode.Text = "";
+                        txtCode.Focus();
                         return;
                     }
                     else
                     {
+                        txtCode.Text = "";
+                        txtCode.Focus();
                         return;
                     }
                 }
@@ -1329,8 +1381,6 @@ namespace QMAPP.WinForm.Forms.TianJin
                     return;
 
                     #endregion
-
-
                 }
 
 
@@ -1445,8 +1495,6 @@ namespace QMAPP.WinForm.Forms.TianJin
                 }
                 if (signal != false)
                 {
-                    #region 去数据库查询相关产品信息，外来零件忽略此步骤
-
                     #region 校验是否有重复的扫过的条码
                     //------------------校验是否有重复的扫过的条码------
 
@@ -1473,7 +1521,7 @@ namespace QMAPP.WinForm.Forms.TianJin
                     FISDataCompare(Code, ProMaterial, MOULD_CODE);
 
                     #endregion
-                    #endregion
+                  
                 }
                 else
                 {
@@ -2045,6 +2093,14 @@ namespace QMAPP.WinForm.Forms.TianJin
             {
                 strprodtype = "( 右 )";
             }
+            else if (pFisType == "03")
+            {
+                strprodtype = "( 前 )";
+            }
+            else if (pFisType == "04")
+            {
+                strprodtype = "( 后 )";
+            }
 
             DataTable dt = new DataTable();
             dt.Columns.Add("ROWINDEX");
@@ -2297,38 +2353,87 @@ namespace QMAPP.WinForm.Forms.TianJin
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        int signal = 0;
+        //int signal = 0;
         private void rb_hx_CheckedChanged(object sender, EventArgs e)
         {
             if (dgvNF.Rows.Count > 0)
             {
-                if (rb_hx.Checked == true && signal == 0)
-                {
-                    signal++;
-                    rb_dx.Checked = true;
-                }
-                else if (rb_dx.Checked == true && signal == 0)
-                {
-                    signal++;
-                    rb_hx.Checked = true;
-                }
                 lberror.Text = "已扫描数据区不为空，重置或者扫描整车后才能切换生产线!";
-                signal = 0;
                 return;
             }
             lberror.Text = "";
-            QMAPP.WinForm.Common.LocalSetting.Settings["FlashProCode"] = rb_hx.Checked ? "01" : "02";
+            QMAPP.WinForm.Common.LocalSetting.Settings["FlashProCode"]= "01";
-            if (this.rb_hx.Checked == true)
+           
+            //混
+            pFisType = "01";
+            WORKCENTER_CODE = "IPFY01";
+           
+            GetInitData();
+            GetLastPastCard();
+        }
+        /// <summary>
+        /// 右侧门板
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void rb_dx_CheckedChanged(object sender, EventArgs e)
+        {
+            if (dgvNF.Rows.Count > 0)
             {
-                //混
+                lberror.Text = "已扫描数据区不为空，重置或者扫描整车后才能切换生产线!";
-                pFisType = "01";
+                return;
-                WORKCENTER_CODE = "IPFY01";
             }
-            else
+            lberror.Text = "";
-            {   //单
+            QMAPP.WinForm.Common.LocalSetting.Settings["FlashProCode"] = "01";
-                pFisType = "02";
+
-                WORKCENTER_CODE = "IPFY02";
+            //混
+            pFisType = "02";
+            WORKCENTER_CODE = "IPFY02";
+
+            GetInitData();
+            GetLastPastCard();
+        }
+        /// <summary>
+        /// 018前门
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ra_hx_CheckedChanged(object sender, EventArgs e)
+        {
+            if (dgvNF.Rows.Count > 0)
+            {
+                lberror.Text = "已扫描数据区不为空，重置或者扫描整车后才能切换生产线!";
+                return;
+            }
+            lberror.Text = "";
+            QMAPP.WinForm.Common.LocalSetting.Settings["FlashProCode"] = "03";
+
+            //混
+            pFisType = "03";
+            WORKCENTER_CODE = "IPFY03";
+
+            GetInitData();
+            GetLastPastCard();
+        }
+        /// <summary>
+        /// 018后门
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ra_dx_CheckedChanged(object sender, EventArgs e)
+        {
+            if (dgvNF.Rows.Count > 0)
+            {
+                lberror.Text = "已扫描数据区不为空，重置或者扫描整车后才能切换生产线!";
+                return;
             }
+            lberror.Text = "";
+            QMAPP.WinForm.Common.LocalSetting.Settings["FlashProCode"] = "04";
+
+            //混
+            pFisType = "04";
+            WORKCENTER_CODE = "IPFY04";
+
             GetInitData();
             GetLastPastCard();
         }
@@ -2460,5 +2565,7 @@ namespace QMAPP.WinForm.Forms.TianJin
             else
                 return null;
         }
+
+        
     }
 }

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

@@ -29,8 +29,8 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
             this.panel1 = new System.Windows.Forms.FlowLayoutPanel();
@@ -42,6 +42,8 @@
             this.rb_hx = new System.Windows.Forms.RadioButton();
             this.rb_dx = new System.Windows.Forms.RadioButton();
             this.lblCount = new System.Windows.Forms.Label();
+            this.ra_hx = new System.Windows.Forms.RadioButton();
+            this.ra_dx = new System.Windows.Forms.RadioButton();
             this.dgvMATChange = new System.Windows.Forms.DataGridView();
             this.PLAN_DATE = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.REQUESTID = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -56,6 +58,19 @@
             this.groupBox1 = new System.Windows.Forms.GroupBox();
             this.panel4 = new System.Windows.Forms.Panel();
             this.dgvNF = new System.Windows.Forms.DataGridView();
+            this.CODE_NF = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.PRODNO_NF = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.CARSETDESC_CN_NF = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.MOULDCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.CREATEDATE_NF = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.SEQ = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dgcPRODUCT_PID = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.tpContainer = new System.Windows.Forms.TableLayoutPanel();
             this.panel3 = new System.Windows.Forms.FlowLayoutPanel();
             this.btnPrint_NF = new System.Windows.Forms.Button();
@@ -75,19 +90,6 @@
             this.timeRefew = new System.Windows.Forms.Timer(this.components);
             this.panel7 = new System.Windows.Forms.Panel();
             this.panel8 = new System.Windows.Forms.Panel();
-            this.CODE_NF = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.PRODNO_NF = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.CARSETDESC_CN_NF = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.MOULDCODE = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.CREATEDATE_NF = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.SEQ = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dgcPRODUCT_PID = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.groupBox2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
             this.splitContainer1.Panel1.SuspendLayout();
@@ -146,6 +148,8 @@
             this.panel1.Controls.Add(this.rb_hx);
             this.panel1.Controls.Add(this.rb_dx);
             this.panel1.Controls.Add(this.lblCount);
+            this.panel1.Controls.Add(this.ra_hx);
+            this.panel1.Controls.Add(this.ra_dx);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
@@ -230,6 +234,7 @@
             this.rb_dx.TabIndex = 6;
             this.rb_dx.Text = "右侧门板";
             this.rb_dx.UseVisualStyleBackColor = true;
+            this.rb_dx.CheckedChanged += new System.EventHandler(this.rb_dx_CheckedChanged);
             // 
             // lblCount
             // 
@@ -243,6 +248,28 @@
             this.lblCount.TabIndex = 21;
             this.lblCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
+            // ra_hx
+            // 
+            this.ra_hx.AutoSize = true;
+            this.ra_hx.Location = new System.Drawing.Point(666, 3);
+            this.ra_hx.Name = "ra_hx";
+            this.ra_hx.Size = new System.Drawing.Size(77, 16);
+            this.ra_hx.TabIndex = 22;
+            this.ra_hx.Text = "018前门板";
+            this.ra_hx.UseVisualStyleBackColor = true;
+            this.ra_hx.CheckedChanged += new System.EventHandler(this.ra_hx_CheckedChanged);
+            // 
+            // ra_dx
+            // 
+            this.ra_dx.AutoSize = true;
+            this.ra_dx.Location = new System.Drawing.Point(3, 32);
+            this.ra_dx.Name = "ra_dx";
+            this.ra_dx.Size = new System.Drawing.Size(77, 16);
+            this.ra_dx.TabIndex = 23;
+            this.ra_dx.Text = "018后门板";
+            this.ra_dx.UseVisualStyleBackColor = true;
+            this.ra_dx.CheckedChanged += new System.EventHandler(this.ra_dx_CheckedChanged);
+            // 
             // dgvMATChange
             // 
             this.dgvMATChange.AllowUserToAddRows = false;
@@ -261,18 +288,17 @@
             this.PID,
             this.clscanstate,
             this.STATE});
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F);
+            dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F);
-            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle1.Padding = new System.Windows.Forms.Padding(0, 0, 15, 0);
+            dataGridViewCellStyle5.Padding = new System.Windows.Forms.Padding(0, 0, 15, 0);
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvMATChange.DefaultCellStyle = dataGridViewCellStyle1;
+            this.dgvMATChange.DefaultCellStyle = dataGridViewCellStyle5;
             this.dgvMATChange.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvMATChange.Location = new System.Drawing.Point(0, 0);
-            this.dgvMATChange.MultiSelect = true;
             this.dgvMATChange.Name = "dgvMATChange";
             this.dgvMATChange.ReadOnly = true;
             this.dgvMATChange.RowHeadersWidth = 40;
@@ -423,15 +449,15 @@
             this.Column11,
             this.Column13,
             this.dgcPRODUCT_PID});
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle2.Padding = new System.Windows.Forms.Padding(0, 0, 10, 0);
+            dataGridViewCellStyle6.Padding = new System.Windows.Forms.Padding(0, 0, 10, 0);
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvNF.DefaultCellStyle = dataGridViewCellStyle2;
+            this.dgvNF.DefaultCellStyle = dataGridViewCellStyle6;
             this.dgvNF.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvNF.Location = new System.Drawing.Point(0, 0);
             this.dgvNF.Name = "dgvNF";
@@ -443,6 +469,123 @@
             this.dgvNF.Size = new System.Drawing.Size(460, 364);
             this.dgvNF.TabIndex = 0;
             // 
+            // CODE_NF
+            // 
+            this.CODE_NF.DataPropertyName = "SANBARCODE";
+            this.CODE_NF.HeaderText = "条码号";
+            this.CODE_NF.Name = "CODE_NF";
+            this.CODE_NF.ReadOnly = true;
+            this.CODE_NF.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.CODE_NF.Width = 57;
+            // 
+            // PRODNO_NF
+            // 
+            this.PRODNO_NF.DataPropertyName = "PRODNO";
+            this.PRODNO_NF.HeaderText = "零件号";
+            this.PRODNO_NF.Name = "PRODNO_NF";
+            this.PRODNO_NF.ReadOnly = true;
+            this.PRODNO_NF.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.PRODNO_NF.Width = 57;
+            // 
+            // CARSETDESC_CN_NF
+            // 
+            this.CARSETDESC_CN_NF.DataPropertyName = "CARSETDESC_CN";
+            this.CARSETDESC_CN_NF.HeaderText = "总成描述";
+            this.CARSETDESC_CN_NF.Name = "CARSETDESC_CN_NF";
+            this.CARSETDESC_CN_NF.ReadOnly = true;
+            this.CARSETDESC_CN_NF.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.CARSETDESC_CN_NF.Width = 69;
+            // 
+            // MOULDCODE
+            // 
+            this.MOULDCODE.DataPropertyName = "MOULDCODE";
+            this.MOULDCODE.HeaderText = "位置";
+            this.MOULDCODE.Name = "MOULDCODE";
+            this.MOULDCODE.ReadOnly = true;
+            this.MOULDCODE.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.MOULDCODE.Width = 45;
+            // 
+            // CREATEDATE_NF
+            // 
+            this.CREATEDATE_NF.DataPropertyName = "SCANDATE";
+            this.CREATEDATE_NF.HeaderText = "扫描时间";
+            this.CREATEDATE_NF.Name = "CREATEDATE_NF";
+            this.CREATEDATE_NF.ReadOnly = true;
+            this.CREATEDATE_NF.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.CREATEDATE_NF.Width = 69;
+            // 
+            // Column1
+            // 
+            this.Column1.DataPropertyName = "PASTEDETAILED_CARD_KEY";
+            this.Column1.HeaderText = "Column1";
+            this.Column1.Name = "Column1";
+            this.Column1.ReadOnly = true;
+            this.Column1.Visible = false;
+            this.Column1.Width = 82;
+            // 
+            // SEQ
+            // 
+            this.SEQ.DataPropertyName = "SEQ";
+            this.SEQ.HeaderText = "SEQ";
+            this.SEQ.Name = "SEQ";
+            this.SEQ.ReadOnly = true;
+            this.SEQ.Visible = false;
+            this.SEQ.Width = 58;
+            // 
+            // Column2
+            // 
+            this.Column2.DataPropertyName = "FIS_KEY";
+            this.Column2.HeaderText = "Column2";
+            this.Column2.Name = "Column2";
+            this.Column2.ReadOnly = true;
+            this.Column2.Visible = false;
+            this.Column2.Width = 82;
+            // 
+            // Column3
+            // 
+            this.Column3.DataPropertyName = "PASTE_CARD_KEY";
+            this.Column3.HeaderText = "Column3";
+            this.Column3.Name = "Column3";
+            this.Column3.ReadOnly = true;
+            this.Column3.Visible = false;
+            this.Column3.Width = 82;
+            // 
+            // Column7
+            // 
+            this.Column7.DataPropertyName = "VIN";
+            this.Column7.HeaderText = "Column7";
+            this.Column7.Name = "Column7";
+            this.Column7.ReadOnly = true;
+            this.Column7.Visible = false;
+            this.Column7.Width = 82;
+            // 
+            // Column11
+            // 
+            this.Column11.DataPropertyName = "DGVROWINDEX";
+            this.Column11.HeaderText = "Column11";
+            this.Column11.Name = "Column11";
+            this.Column11.ReadOnly = true;
+            this.Column11.Visible = false;
+            this.Column11.Width = 88;
+            // 
+            // Column13
+            // 
+            this.Column13.DataPropertyName = "LINENO";
+            this.Column13.HeaderText = "Column13";
+            this.Column13.Name = "Column13";
+            this.Column13.ReadOnly = true;
+            this.Column13.Visible = false;
+            this.Column13.Width = 88;
+            // 
+            // dgcPRODUCT_PID
+            // 
+            this.dgcPRODUCT_PID.DataPropertyName = "PRODUCT_PID";
+            this.dgcPRODUCT_PID.HeaderText = "产品主键";
+            this.dgcPRODUCT_PID.Name = "dgcPRODUCT_PID";
+            this.dgcPRODUCT_PID.ReadOnly = true;
+            this.dgcPRODUCT_PID.Visible = false;
+            this.dgcPRODUCT_PID.Width = 88;
+            // 
             // tpContainer
             // 
             this.tpContainer.BackColor = System.Drawing.SystemColors.ControlDark;
@@ -650,123 +793,6 @@
             this.panel8.Size = new System.Drawing.Size(1239, 50);
             this.panel8.TabIndex = 19;
             // 
-            // CODE_NF
-            // 
-            this.CODE_NF.DataPropertyName = "SANBARCODE";
-            this.CODE_NF.HeaderText = "条码号";
-            this.CODE_NF.Name = "CODE_NF";
-            this.CODE_NF.ReadOnly = true;
-            this.CODE_NF.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.CODE_NF.Width = 57;
-            // 
-            // PRODNO_NF
-            // 
-            this.PRODNO_NF.DataPropertyName = "PRODNO";
-            this.PRODNO_NF.HeaderText = "零件号";
-            this.PRODNO_NF.Name = "PRODNO_NF";
-            this.PRODNO_NF.ReadOnly = true;
-            this.PRODNO_NF.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.PRODNO_NF.Width = 57;
-            // 
-            // CARSETDESC_CN_NF
-            // 
-            this.CARSETDESC_CN_NF.DataPropertyName = "CARSETDESC_CN";
-            this.CARSETDESC_CN_NF.HeaderText = "总成描述";
-            this.CARSETDESC_CN_NF.Name = "CARSETDESC_CN_NF";
-            this.CARSETDESC_CN_NF.ReadOnly = true;
-            this.CARSETDESC_CN_NF.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.CARSETDESC_CN_NF.Width = 69;
-            // 
-            // MOULDCODE
-            // 
-            this.MOULDCODE.DataPropertyName = "MOULDCODE";
-            this.MOULDCODE.HeaderText = "位置";
-            this.MOULDCODE.Name = "MOULDCODE";
-            this.MOULDCODE.ReadOnly = true;
-            this.MOULDCODE.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.MOULDCODE.Width = 45;
-            // 
-            // CREATEDATE_NF
-            // 
-            this.CREATEDATE_NF.DataPropertyName = "SCANDATE";
-            this.CREATEDATE_NF.HeaderText = "扫描时间";
-            this.CREATEDATE_NF.Name = "CREATEDATE_NF";
-            this.CREATEDATE_NF.ReadOnly = true;
-            this.CREATEDATE_NF.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.CREATEDATE_NF.Width = 69;
-            // 
-            // Column1
-            // 
-            this.Column1.DataPropertyName = "PASTEDETAILED_CARD_KEY";
-            this.Column1.HeaderText = "Column1";
-            this.Column1.Name = "Column1";
-            this.Column1.ReadOnly = true;
-            this.Column1.Visible = false;
-            this.Column1.Width = 82;
-            // 
-            // SEQ
-            // 
-            this.SEQ.DataPropertyName = "SEQ";
-            this.SEQ.HeaderText = "SEQ";
-            this.SEQ.Name = "SEQ";
-            this.SEQ.ReadOnly = true;
-            this.SEQ.Visible = false;
-            this.SEQ.Width = 58;
-            // 
-            // Column2
-            // 
-            this.Column2.DataPropertyName = "FIS_KEY";
-            this.Column2.HeaderText = "Column2";
-            this.Column2.Name = "Column2";
-            this.Column2.ReadOnly = true;
-            this.Column2.Visible = false;
-            this.Column2.Width = 82;
-            // 
-            // Column3
-            // 
-            this.Column3.DataPropertyName = "PASTE_CARD_KEY";
-            this.Column3.HeaderText = "Column3";
-            this.Column3.Name = "Column3";
-            this.Column3.ReadOnly = true;
-            this.Column3.Visible = false;
-            this.Column3.Width = 82;
-            // 
-            // Column7
-            // 
-            this.Column7.DataPropertyName = "VIN";
-            this.Column7.HeaderText = "Column7";
-            this.Column7.Name = "Column7";
-            this.Column7.ReadOnly = true;
-            this.Column7.Visible = false;
-            this.Column7.Width = 82;
-            // 
-            // Column11
-            // 
-            this.Column11.DataPropertyName = "DGVROWINDEX";
-            this.Column11.HeaderText = "Column11";
-            this.Column11.Name = "Column11";
-            this.Column11.ReadOnly = true;
-            this.Column11.Visible = false;
-            this.Column11.Width = 88;
-            // 
-            // Column13
-            // 
-            this.Column13.DataPropertyName = "LINENO";
-            this.Column13.HeaderText = "Column13";
-            this.Column13.Name = "Column13";
-            this.Column13.ReadOnly = true;
-            this.Column13.Visible = false;
-            this.Column13.Width = 88;
-            // 
-            // dgcPRODUCT_PID
-            // 
-            this.dgcPRODUCT_PID.DataPropertyName = "PRODUCT_PID";
-            this.dgcPRODUCT_PID.HeaderText = "产品主键";
-            this.dgcPRODUCT_PID.Name = "dgcPRODUCT_PID";
-            this.dgcPRODUCT_PID.ReadOnly = true;
-            this.dgcPRODUCT_PID.Visible = false;
-            this.dgcPRODUCT_PID.Width = 88;
-            // 
             // TJFrmPlace
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -860,5 +886,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column11;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column13;
         private System.Windows.Forms.DataGridViewTextBoxColumn dgcPRODUCT_PID;
+        private System.Windows.Forms.RadioButton ra_hx;
+        private System.Windows.Forms.RadioButton ra_dx;
     }
 }

APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs

@@ -78,6 +78,7 @@
             this.dtpCREATEDATESTART = new DateTimePickerA();
             this.label4 = new System.Windows.Forms.Label();
             this.label5 = new System.Windows.Forms.Label();
+            this.SelectStripButton = new System.Windows.Forms.ToolStripButton();
             ((System.ComponentModel.ISupportInitialize)(this.dgvPlan)).BeginInit();
             this.tpContent.SuspendLayout();
             this.tpPlanList.SuspendLayout();
@@ -273,6 +274,7 @@
             this.toolStrip1.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.toolStrip1.ImageScalingSize = new System.Drawing.Size(20, 20);
             this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.SelectStripButton,
             this.toolStripButton2,
             this.toolStripButton1,
             this.tsbPrint,
@@ -341,7 +343,7 @@
             this.tsmiSuspendOrder.Image = global::QMAPP.WinForm.Resource1.stop;
             this.tsmiSuspendOrder.Margin = new System.Windows.Forms.Padding(0, 7, 0, 7);
             this.tsmiSuspendOrder.Name = "tsmiSuspendOrder";
-            this.tsmiSuspendOrder.Size = new System.Drawing.Size(144, 26);
+            this.tsmiSuspendOrder.Size = new System.Drawing.Size(184, 26);
             this.tsmiSuspendOrder.Text = "挂起工单";
             this.tsmiSuspendOrder.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
             this.tsmiSuspendOrder.Click += new System.EventHandler(this.tsmiSuspendOrder_Click);
@@ -351,7 +353,7 @@
             this.tsmiCancelSuspend.Image = global::QMAPP.WinForm.Resource1.back;
             this.tsmiCancelSuspend.Margin = new System.Windows.Forms.Padding(0, 7, 0, 7);
             this.tsmiCancelSuspend.Name = "tsmiCancelSuspend";
-            this.tsmiCancelSuspend.Size = new System.Drawing.Size(144, 26);
+            this.tsmiCancelSuspend.Size = new System.Drawing.Size(184, 26);
             this.tsmiCancelSuspend.Text = "取消挂起";
             this.tsmiCancelSuspend.Click += new System.EventHandler(this.tsmiCancelSuspend_Click);
             // 
@@ -360,7 +362,7 @@
             this.tsmiDeleteOrder.Image = global::QMAPP.WinForm.Resource1.delete;
             this.tsmiDeleteOrder.Margin = new System.Windows.Forms.Padding(0, 7, 0, 7);
             this.tsmiDeleteOrder.Name = "tsmiDeleteOrder";
-            this.tsmiDeleteOrder.Size = new System.Drawing.Size(144, 26);
+            this.tsmiDeleteOrder.Size = new System.Drawing.Size(184, 26);
             this.tsmiDeleteOrder.Text = "删除工单";
             this.tsmiDeleteOrder.Click += new System.EventHandler(this.tsmiDeleteOrder_Click);
             // 
@@ -446,7 +448,6 @@
             // 
             // timer1
             // 
-            this.timer1.Enabled = true;
             this.timer1.Interval = 1000;
             this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
             // 
@@ -543,6 +544,18 @@
             this.label5.TabIndex = 22;
             this.label5.Text = "至";
             // 
+            // SelectStripButton
+            // 
+            this.SelectStripButton.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.SelectStripButton.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.SelectStripButton.Image = ((System.Drawing.Image)(resources.GetObject("SelectStripButton.Image")));
+            this.SelectStripButton.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.SelectStripButton.ImageTransparentColor = System.Drawing.Color.White;
+            this.SelectStripButton.Name = "SelectStripButton";
+            this.SelectStripButton.Size = new System.Drawing.Size(94, 67);
+            this.SelectStripButton.Text = "刷新";
+            this.SelectStripButton.Click += new System.EventHandler(this.SelectStripButton_Click);
+            // 
             // TJPrintPlanLabel
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 25F);
@@ -619,5 +632,6 @@
         private DateTimePickerA dtpCREATEDATESTART;
         private System.Windows.Forms.Label label4;
         private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.ToolStripButton SelectStripButton;
     }
 }

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

@@ -23,6 +23,7 @@ namespace QMAPP.WinForm.Forms.TianJin
         List<QMAPP.FJC.Entity.Basic.ProcessRoute> cbsource = null;
 
         private string planMATERIAL_CODE = string.Empty;
+        private string FR = string.Empty;
 
         /// <summary>
         /// 
@@ -126,10 +127,40 @@ namespace QMAPP.WinForm.Forms.TianJin
                 //{
                 //    searchModel.EndTime = Convert.ToDateTime((this.dtpCREATEDATEEND.Value).ToString("yyyy-MM-dd") + " 23:59:59");
                 //}
-                #region 服务查询
+                if (cbRoutes.Text.Contains("018D"))
-                var orderlist = _agent.InvokeServiceFunction<List<FJC.Entity.ProductionPlan.WorkOrder>>("TJWorkOrderBLL_GetOrderUnPrinted", cbRoutes.SelectedValue.ToString(), cbPlanFilter.SelectedIndex, dataPage, comboBox1.SelectedValue.ToString(), comboBox2.SelectedValue.ToString(), this.dtpCREATEDATESTART.Value.ToString(), this.dtpCREATEDATEEND.Value.ToString());
+                {
-                #endregion
+                    var count = Convert.ToInt32(cbListRowcount.Text) / 2;
-                this.dgvPlan.DataSource = orderlist;
+                    var orderlist =new List<FJC.Entity.ProductionPlan.WorkOrder>();
+                    var orderlistF = _agent.InvokeServiceFunction<List<FJC.Entity.ProductionPlan.WorkOrder>>("TJWorkOrderBLL_GetOrderUnPrinted018DF", cbRoutes.SelectedValue.ToString(), cbPlanFilter.SelectedIndex, dataPage, comboBox1.SelectedValue.ToString(), comboBox2.SelectedValue.ToString(), this.dtpCREATEDATESTART.Value.ToString(), this.dtpCREATEDATEEND.Value.ToString());
+                    var orderlistR = _agent.InvokeServiceFunction<List<FJC.Entity.ProductionPlan.WorkOrder>>("TJWorkOrderBLL_GetOrderUnPrinted018DR", cbRoutes.SelectedValue.ToString(), cbPlanFilter.SelectedIndex, dataPage, comboBox1.SelectedValue.ToString(), comboBox2.SelectedValue.ToString(), this.dtpCREATEDATESTART.Value.ToString(), this.dtpCREATEDATEEND.Value.ToString());
+                    for (var i = 0; i < count; i++)
+                    {
+                        if (string.IsNullOrEmpty(FR) || FR == "前")
+                        {
+                            if (i < orderlistF.Count)
+                                orderlist.Add(orderlistF[i]);
+                            if (i < orderlistR.Count)
+                                orderlist.Add(orderlistR[i]);
+                        }
+                        else if (FR == "后")
+                        {
+                            if (i < orderlistR.Count)
+                                orderlist.Add(orderlistR[i]);
+                            if (i < orderlistF.Count)
+                                orderlist.Add(orderlistF[i]);
+                        }
+                    }
+                    this.dgvPlan.DataSource = orderlist;
+
+                }
+                else
+                {
+                    #region 服务查询
+                    var orderlist = _agent.InvokeServiceFunction<List<FJC.Entity.ProductionPlan.WorkOrder>>("TJWorkOrderBLL_GetOrderUnPrinted", cbRoutes.SelectedValue.ToString(), cbPlanFilter.SelectedIndex, dataPage, comboBox1.SelectedValue.ToString(), comboBox2.SelectedValue.ToString(), this.dtpCREATEDATESTART.Value.ToString(), this.dtpCREATEDATEEND.Value.ToString());
+                    #endregion
+                    this.dgvPlan.DataSource = orderlist;
+                }
+                
             }
             catch (Exception ex)
             {
@@ -169,7 +200,7 @@ namespace QMAPP.WinForm.Forms.TianJin
         {
             if (!tsbOrderOperation.DropDown.Visible)
             {
-                timecounter += 1;
+                timecounter = 1;
                 if (timecounter > int.Parse("20"))//计时达到刷新时间
                 {
                     BindPlanView();
@@ -482,7 +513,7 @@ namespace QMAPP.WinForm.Forms.TianJin
                     var orders2 = new List<FJC.Entity.ProductionPlan.WorkOrder>();
                     var order2 = (FJC.Entity.ProductionPlan.WorkOrder)dgvPlan.Rows[1].DataBoundItem;
                     orders2.Add(order2);
-                    if (orders[0].MATERIAL_NAME.Substring(0, 7) != orders2[0].MATERIAL_NAME.Substring(0, 7))
+                    if ((orders[0].MATERIAL_NAME.Substring(0, 7) != orders2[0].MATERIAL_NAME.Substring(0, 7))&& !orders[0].MATERIAL_CODE.Contains("018D"))
                     {
                         MessageBox.Show("计划工单即将变换配置，请注意！");
                     }
@@ -531,7 +562,10 @@ namespace QMAPP.WinForm.Forms.TianJin
                 InsertProduct(labeldata.OrderNo, orders[0].MATERIAL_CODE, comboBox1.SelectedValue.ToString());
 
                 WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "      插入结束" + labeldata.OrderNo);
-
+                if (orders[0].MATERIAL_CODE.Contains("018D") && orders[0].MATERIAL_NAME.Contains("前"))
+                    FR = "后";
+                else if(orders[0].MATERIAL_CODE.Contains("018D") && orders[0].MATERIAL_NAME.Contains("后"))
+                    FR = "前";
                 BindPlanView();
                 tsbPrint.Enabled = true;
                 
@@ -650,7 +684,7 @@ namespace QMAPP.WinForm.Forms.TianJin
             
             for (var i = 0; i < count; i++)
             {
-                System.Threading.Thread.Sleep(3000);
+                System.Threading.Thread.Sleep(1000);
 
                 var orders = new List<FJC.Entity.ProductionPlan.WorkOrder>();
 
@@ -662,7 +696,7 @@ namespace QMAPP.WinForm.Forms.TianJin
                     var orders2 = new List<FJC.Entity.ProductionPlan.WorkOrder>();
                     var order2 = (FJC.Entity.ProductionPlan.WorkOrder)dgvPlan.Rows[i + 1].DataBoundItem;
                     orders2.Add(order2);
-                    if (orders[0].MATERIAL_NAME.Substring(0, 7) != orders2[0].MATERIAL_NAME.Substring(0, 7))
+                    if ((orders[0].MATERIAL_NAME.Substring(0, 7) != orders2[0].MATERIAL_NAME.Substring(0, 7)) && !orders[0].MATERIAL_CODE.Contains("018D"))
                     {
                         MessageBox.Show("计划工单即将变换配置，请注意！");
                     }
@@ -701,7 +735,7 @@ namespace QMAPP.WinForm.Forms.TianJin
 
                 //WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "      开始打印" + labeldata.OrderNo);
 
-                PrintLabel(labels);
+                //PrintLabel(labels);
 
                 //WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "      开始变成打印状态" + labeldata.OrderNo);
                 //变更打印状态 0=>1
@@ -709,7 +743,10 @@ namespace QMAPP.WinForm.Forms.TianJin
 
                 //WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "      开始插入记录" + labeldata.OrderNo);
                 InsertProduct(labeldata.OrderNo, orders[0].MATERIAL_CODE, comboBox1.SelectedValue.ToString());
-
+                if (orders[0].MATERIAL_CODE.Contains("018D") && orders[0].MATERIAL_NAME.Contains("前"))
+                    FR = "后";
+                else if (orders[0].MATERIAL_CODE.Contains("018D") && orders[0].MATERIAL_NAME.Contains("后"))
+                    FR = "前";
                 //WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "      插入结束" + labeldata.OrderNo);
             }
 
@@ -732,6 +769,15 @@ namespace QMAPP.WinForm.Forms.TianJin
         {
             BindPlanView();
         }
+        /// <summary>
+        /// 刷新
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void SelectStripButton_Click(object sender, EventArgs e)
+        {
+            BindPlanView();
+        }
     }
     class Direction {
         public string Code { get; set; }

APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx

@@ -154,6 +154,76 @@
     <value>17, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="SelectStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+        Ae6xxmll7eSUAAAAAElFTkSuQmCC
+</value>
+  </data>
   <data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8

Exchange/QM.ServiceHost/QM.ServiceHost.csproj

@@ -18,6 +18,21 @@
     <SccLocalPath>SAK</SccLocalPath>
     <SccAuxPath>SAK</SccAuxPath>
     <SccProvider>SAK</SccProvider>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -138,7 +153,13 @@
       <Name>QM.Exchange.Core</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

ProcessFileSyncService/App.config

@@ -13,7 +13,7 @@
   <connectionStrings>
     <!--主数据库连接-->
     <!--<add name="maindb" connectionString="Data Source=10.123.4.21;Initial Catalog=ADIENT_QD_MES;User Id=mesadmin;Password=qdMES123;" providerName="System.Data.SqlClient"/>-->
-    <add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=CDmes123;" providerName="System.Data.SqlClient"/>
+    <add name="maindb" connectionString="Data Source=10.111.144.99;Initial Catalog=ADIENT_CD_MES9;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
   </connectionStrings>
   <!--日志组件配置开始-->
   <log4net>

ServicesCenter/WCF/MsgSendService/App.config

@@ -10,7 +10,7 @@
   </appSettings>
   <connectionStrings>
     <!--主数据库连接-->
-    <add name="maindb" connectionString="Data Source=10.111.144.97;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=CDmes123;" providerName="System.Data.SqlClient"/>
+    <add name="maindb" connectionString="Data Source=10.111.144.97;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=CDmes123;" providerName="System.Data.SqlClient"/>
   </connectionStrings>
   <log4net>
     <logger name="loginfo">

ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config

@@ -63,10 +63,11 @@
   <connectionStrings>
     <!--主数据库连接-->
 
-
+    <!-- 
     <add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
-    <add name="maindbBZD" connectionString="Data Source=10.111.144.98;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
+   
-    <!--
+   <add name="maindbBZD" connectionString="Data Source=10.111.144.98;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
+   
 
   <add name="maindb" connectionString="Data Source=10.111.144.99;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=CDmes123;max pool size=10240;" providerName="System.Data.SqlClient"/>-->
     
@@ -85,6 +86,8 @@
 
     <!--<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=123.56.115.74;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=qwe123$%^;" providerName="System.Data.SqlClient" />
+
     <!--<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;max pool size=10240;" 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"/>-->
 

ServicesCenter/WindowsServices/OpcService/app.config

@@ -10,7 +10,7 @@
 
   </appSettings>
   <connectionStrings>
-    <add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=CDmes123;" providerName="System.Data.SqlClient"/>
+    <add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=CDmes123;" providerName="System.Data.SqlClient"/>
     <!--<add name="maindb" connectionString="Data Source=.;Initial Catalog=ADIENT_CD_MES;Persist Security Info=True;User ID=sa;Password=qm;" providerName="System.Data.SqlClient"/>-->
   </connectionStrings>
   <system.serviceModel>