调整成都BC316-MP4

APP/QMAPP.Web/App_Data/Menu.xml

@@ -298,7 +298,7 @@
     </Actions>
   </MenuItem>-->
   <!--TJDoorPlankPlanPrint   DoorPlankPlan-->
-  <!--<MenuItem MenuID="02030000" SystemID="FJC" MenuDes="TJ门板计划管理"   Action="/TJDoorPlankPlanPrint/List?ORDER_TYPE=DOORPLANK" Target="url" PowerID="CD02030000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="02000000" Seq="1">
+  <MenuItem MenuID="02030000" SystemID="FJC" MenuDes="TJ门板计划管理"   Action="/TJDoorPlankPlanPrint/List?ORDER_TYPE=DOORPLANK" Target="url" PowerID="CD02030000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="02000000" Seq="1">
     <Actions>
       <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="List" PowerID="CD02030001">查询</Action>
       <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="Add" PowerID="CD02030002">添加</Action>
@@ -312,8 +312,8 @@
       <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="ExportExcel" PowerID="CD02030009">导出</Action>
       <Action ContorllerName="TJDoorPlankPlanPrint" ActionName="TemplateExcel" PowerID="CD02030010">下载模板</Action>
     </Actions>
-  </MenuItem>-->
-  <MenuItem MenuID="02030000" SystemID="FJC" MenuDes="门板计划管理"   Action="/DoorPlankPlan/List?ORDER_TYPE=DOORPLANK" Target="url" PowerID="CD02030000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="02000000" Seq="1">
+  </MenuItem>
+  <!--<MenuItem MenuID="02030000" SystemID="FJC" MenuDes="门板计划管理"   Action="/DoorPlankPlan/List?ORDER_TYPE=DOORPLANK" Target="url" PowerID="CD02030000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="02000000" Seq="1">
     <Actions>
       <Action ContorllerName="DoorPlankPlan" ActionName="List" PowerID="CD02030001">查询</Action>
       <Action ContorllerName="DoorPlankPlan" ActionName="Add" PowerID="CD02030002">添加</Action>
@@ -327,7 +327,7 @@
       <Action ContorllerName="DoorPlankPlan" ActionName="ExportExcel" PowerID="CD02030009">导出</Action>
       <Action ContorllerName="DoorPlankPlan" ActionName="TemplateExcel" PowerID="CD02030010">下载模板</Action>
     </Actions>
-  </MenuItem>
+  </MenuItem>-->
   
   <MenuItem MenuID="02040000" SystemID="FJC" MenuDes="仪表板计划管理"   Action="/DashBoardPlan/List?ORDER_TYPE=DASHBOARD" Target="url" PowerID="CD02040000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="02000000" Seq="1">
     <Actions>

APP/QMAPP.Web/App_Data/PCPower.xml

@@ -11,6 +11,7 @@
   <PowerInfo PowerID="CD81030100" PowerDes="条码打印" PowerType="item" ActionList="" Visible="true" Seq="1" SuperID="CD81030000"></PowerInfo>
   <PowerInfo PowerID="CD81030200" PowerDes="工位调整" PowerType="item" ActionList="" Visible="true" Seq="1" SuperID="CD81030000"></PowerInfo>
   <PowerInfo PowerID="CD81030300" PowerDes="模板调整" PowerType="item" ActionList="" Visible="true" Seq="1" SuperID="CD81030000"></PowerInfo>
+  <PowerInfo PowerID="CD81040000" PowerDes="缝纫条码打印" PowerType="item" ActionList="" Visible="true" Seq="1" SuperID="CD81000000"></PowerInfo>
 
 
   <PowerInfo PowerID="CD82000000" PowerDes="加工工位" PowerType="group" ActionList="" Visible="true" Seq="1" SuperID=""></PowerInfo>

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"/>
 
@@ -55,11 +55,11 @@
     <add name="maindb" connectionString="Data Source=10.111.144.99;Initial Catalog=ADIENT_CD_MES_20230930;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
     <add name="maindbBZD" connectionString="Data Source=10.111.144.99;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
 
- -->
+
     <add name="maindb" connectionString="Data Source=10.111.144.111;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password01;" providerName="System.Data.SqlClient"/>
     <add name="maindbBZD" connectionString="Data Source=10.111.144.111;Initial Catalog=BZD;User Id=sa;Password=Password01;" providerName="System.Data.SqlClient"/>
 
-
+ -->
     <!--<add name="maindb" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>
     <add name="maindbBZD" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=BZD;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>-->
 

APPMD/QMAPP.MD.DAL/PbomDAL.cs

@@ -600,6 +600,45 @@ namespace QMAPP.MD.DAL
                 throw ex;
             }
         }
+
+        /// <summary>
+        /// 根据物料号查找BOM头
+        /// </summary>
+        /// <param name="materialCode"></param>
+        /// <returns>BOM头列表</returns>
+        public List<Pbom> GetPbomByMaterialCodeWithPlan(string materialCode,string BomCode)
+        {
+
+            StringBuilder sqlBuilder = new StringBuilder();
+            List<DataParameter> parameters = new List<DataParameter>();
+            sqlBuilder.AppendLine("SELECT H.* ");
+            sqlBuilder.AppendLine(" FROM T_MD_PBOM AS H ");
+            sqlBuilder.AppendLine(" WHERE H.FLGDEL = '0' ");
+            sqlBuilder.AppendLine(" AND (EXISTS (SELECT 1 ");
+            sqlBuilder.AppendLine(" FROM T_MD_PBOM_ITEM AS I ");
+            sqlBuilder.AppendLine(" WHERE  ");
+            sqlBuilder.AppendLine("	I.FLGDEL = '0' ");
+            sqlBuilder.AppendLine("	AND I.MATERIAL_CODE = @materialcode) ");
+            sqlBuilder.AppendLine("	) and H.PBOM_CODE = @BomCode ");
+
+            parameters.Add(new DataParameter("materialcode", DbType.String, materialCode));
+            parameters.Add(new DataParameter("BomCode", DbType.String, BomCode));
+
+            try
+            {
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    string sqlChange = ChangeSqlByDB(sqlBuilder.ToString(), session);
+                    //获取信息
+                    return session.GetList<Pbom>(sqlChange, parameters.ToArray()).ToList();
+                }
+
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
         /// <summary>
         /// 根据物料号查找最终的总成BOM头
         /// </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"/>-->
 
@@ -41,11 +41,11 @@
 
     <add name="maindb" connectionString="Data Source=10.111.144.99;Initial Catalog=ADIENT_CD_MES_20230930;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
     <add name="maindbBZD" connectionString="Data Source=10.111.144.99;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
--->
+
 
     <add name="maindb" connectionString="Data Source=10.111.144.111;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password01;" providerName="System.Data.SqlClient"/>
     <add name="maindbBZD" connectionString="Data Source=10.111.144.111;Initial Catalog=BZD;User Id=sa;Password=Password01;" providerName="System.Data.SqlClient"/>
-
+-->
 
     <!-- <add name="maindb" connectionString="Data Source=123.56.115.74;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=qwe123$%^;" providerName="System.Data.SqlClient" />
  

APPQ5/QMAPP.FJC.BLL/FIS/DoorPlankPlanBLL.cs

@@ -245,7 +245,7 @@ namespace QMAPP.FJC.BLL.FIS
                 var materialcode = "";
                 if (model.MATERIAL_CODE.Substring(model.MATERIAL_CODE.Length - 1, 1) == "L" || model.MATERIAL_CODE.Substring(model.MATERIAL_CODE.Length - 1, 1) == "R")
                 {
-                    if (model.MATERIAL_CODE.Contains("018D"))
+                    if (model.MATERIAL_CODE.Contains("018D")|| model.MATERIAL_CODE.Contains("493D"))
                     {
                         materialcode = model.MATERIAL_CODE;
                     }
@@ -265,6 +265,9 @@ namespace QMAPP.FJC.BLL.FIS
                 if (model.MATERIAL_CODE.Contains("018D"))
                     workcentercode = workcentercode.Replace("770B","018D");
 
+                if (model.MATERIAL_CODE.Contains("493D"))
+                    workcentercode = workcentercode.Replace("770B", "493D");
+
                 model.WORKCENTER_CODE = workcentercode;
                 if (model.WORKCENTER_CODE != "")
                 {
@@ -276,26 +279,38 @@ namespace QMAPP.FJC.BLL.FIS
 
                 var listMatral = new TJDoorPlankPlanDAL();
                 var ListMachine = listMatral.GetListMachine(model.MATERIAL_CODE);
-                
-                foreach (var MA in ListMachine)
+                if (ListMachine.Count <= 0)
                 {
-                    if (MA.MATERIALNAME.Contains("左"))
-                    {
-                        if (model.MATERIAL_CODE.Contains("018"))
-                            model.ROUTE_CODE = "DP_L_ASSEMBLY_018D";
-                        else
-                            model.ROUTE_CODE = "DP_L_ASSEMBLY_770B";
-                    }
-                    else if (MA.MATERIALNAME.Contains("右"))
+                    model.ROUTE_CODE = routecode.ROUTE_CODE;
+                }
+                else
+                {
+                    foreach (var MA in ListMachine)
                     {
-                        if (model.MATERIAL_CODE.Contains("018"))
-                            model.ROUTE_CODE = "DP_R_ASSEMBLY_018D";
-                        else
-                            model.ROUTE_CODE = "DP_R_ASSEMBLY_770B";
+                        if (MA.MATERIALNAME.Contains("左"))
+                        {
+                            if (model.MATERIAL_CODE.Contains("018"))
+                                model.ROUTE_CODE = "DP_L_ASSEMBLY_018D";
+                            else if (model.MATERIAL_CODE.Contains("493"))
+                            {
+                                model.ROUTE_CODE = "DP_L_ASSEMBLY_493D";
+                            }
+                            else
+                                model.ROUTE_CODE = "DP_L_ASSEMBLY_770B";
+                        }
+                        else if (MA.MATERIALNAME.Contains("右"))
+                        {
+                            if (model.MATERIAL_CODE.Contains("018"))
+                                model.ROUTE_CODE = "DP_R_ASSEMBLY_018D";
+                            else if (model.MATERIAL_CODE.Contains("493"))
+                                model.ROUTE_CODE = "DP_R_ASSEMBLY_493D";
+                            else
+                                model.ROUTE_CODE = "DP_R_ASSEMBLY_770B";
+                        }
                     }
-
                 }
                 
+                
                 //model.ROUTE_CODE = "DP_ASSEMBLY_770B";
                 model.CREATEUSER = this.LoginUser.UserID;
                 model.CREATEDATE = DateTime.Now;
@@ -921,7 +936,7 @@ namespace QMAPP.FJC.BLL.FIS
             //    return null;
             //}
 
-            if (((info.MATERIAL_CODE.Substring(0,4) == "018D"|| info.MATERIAL_CODE.Substring(0, 4) == "278D") && info.MATERIAL_CODE.Length > 10)|| (info.MATERIAL_CODE.Substring(0, 3) == "770" && info.MATERIAL_CODE.Length > 7)|| info.MATERIAL_CODE.Length>=14)
+            if (((info.MATERIAL_CODE.Substring(0, 4) == "493D" || info.MATERIAL_CODE.Substring(0,4) == "018D"|| info.MATERIAL_CODE.Substring(0, 4) == "278D") && info.MATERIAL_CODE.Length > 10)|| (info.MATERIAL_CODE.Substring(0, 3) == "770" && info.MATERIAL_CODE.Length > 7)|| info.MATERIAL_CODE.Length>=14)
             {
                 string pbomcode = info.MATERIAL_CODE;
                 List<ProcessRouteWorkCellSeq> list = workCelldal.GetFirstWorkCell(pbomcode);

APPQ5/QMAPP.FJC.BLL/FIS/FISPhraseBLL.cs

@@ -14,9 +14,9 @@ namespace QMAPP.FJC.BLL.FIS
             return new DAL.FIS.FISPhraseDAL().GetFisPhraseBook(assymaterialcode, positioncode);
         }
 
-        public FISPhraseBook GetPHRASEBOOK(string Code)
+        public FISPhraseBook GetPHRASEBOOK(string Code,string Class)
         {
-            return new DAL.FIS.FISPhraseDAL().GetPHRASEBOOK(Code);
+            return new DAL.FIS.FISPhraseDAL().GetPHRASEBOOK(Code, Class);
         }
 
         public List<FISAssembly> GetAssemblyList(FISAssembly condation)

APPQ5/QMAPP.FJC.BLL/Operation/MainOperationBLL.cs

@@ -2837,6 +2837,40 @@ namespace QMAPP.FJC.BLL.Operation
             return result;
         }
 
+        /// <summary>
+        /// BC316-MP4对线包覆打印
+        /// </summary>
+        /// <param name="product"></param>
+        /// <returns></returns>
+        public DataResult<List<PrintCode>> GetPrintCodeForMP4D(Material item,string ProductCode)
+        {
+            DataResult<List<PrintCode>> result = new DataResult<List<PrintCode>>();
+            List<PrintCode> printCodeList = new List<PrintCode>();
+            PrintCodeDAL dal = new PrintCodeDAL();
+            PrintCode proCodeInfo = new PrintCode();
+            proCodeInfo.PRODUCTCODE = item.MATERIAL_CODE;
+            //获取PrinCode信息
+            proCodeInfo = new PrintCodeDAL().GetPrintCodeInfo(proCodeInfo);
+            if (proCodeInfo != null)
+            {
+                if (proCodeInfo.UPDATETIME.ToShortDateString() != DateTime.Now.ToShortDateString())
+                {
+                    proCodeInfo.SERIAL_NUM = 0;
+                    dal.UpdateBySql(proCodeInfo);
+                }
+
+                string time = DateTime.Now.ToString("yyMMddHHmm");
+                proCodeInfo.SERIAL_NUM = proCodeInfo.SERIAL_NUM + 1;
+                string serialnumber = (proCodeInfo.SERIAL_NUM).ToString().PadLeft(4, '0');
+                proCodeInfo.MAINCODE = proCodeInfo.PRECODE + time + serialnumber;
+                new PrintCodeDAL().InsertExchangeProduct(ProductCode, proCodeInfo.MAINCODE);
+                dal.Update(proCodeInfo);
+                printCodeList.Add(proCodeInfo);
+            }
+            
+            result.Result = printCodeList;
+            return result;
+        }
 
         /// <summary>
         /// 成都注塑条码打印带注塑参数

APPQ5/QMAPP.FJC.DAL/Basic/ProcessParameterDAL.cs

@@ -784,5 +784,36 @@ namespace QMAPP.FJC.DAL.Basic
                 throw ex;
             }
         }
+
+        public bool BFParameterRecord(string productcode)
+        {
+            try
+            {
+                StringBuilder sql = new StringBuilder();
+                sql.AppendLine("SELECT * ");
+                sql.AppendLine("  FROM T_MD_ExchangeProduct");
+                sql.AppendLine(" WHERE ProductCode = @productcode");
+                List<DataParameter> parameters = new List<DataParameter>();
+                parameters.Add(new DataParameter("productcode", productcode));
+
+                
+                using (IDataSession session = AppDataFactory.CreateMainSession())
+                {
+                    var record = session.GetTable(sql.ToString(), parameters.ToArray());
+                    if (record.Rows.Count > 0)
+                    {
+                        var sql2 = $"select * from T_AW_MAINOPERATION where PRODUCTCODE = '{record.Rows[0]["MainCode"].ToString() }' and WORKCELL_CODE = 'PRESS_FIT_BC316'";
+                        var record2 = session.GetTable(sql2.ToString(), new List<DataParameter>().ToArray());
+                        return record2.Rows.Count > 0;
+                    }
+                    
+                    return false;
+                }
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
     }
 }

APPQ5/QMAPP.FJC.DAL/FIS/FISPhraseDAL.cs

@@ -86,12 +86,16 @@ namespace QMAPP.FJC.DAL.FIS
             }
         }
 
-        public FISPhraseBook GetPHRASEBOOK(string Code)
+        public FISPhraseBook GetPHRASEBOOK(string Code,string Class)
         {
             StringBuilder sql = new StringBuilder();
             sql.AppendLine("SELECT Text ");
             sql.AppendLine("FROM T_FIS_PHRASEBOOK ");
             sql.AppendLine($"WHERE Code = '{Code}' ");
+            if (!string.IsNullOrEmpty(Class))
+            {
+                sql.AppendLine($"and Class = '{Class}' ");
+            }
             
             using (IDataSession session = AppDataFactory.CreateMainSession())
             {

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

@@ -39,6 +39,19 @@ namespace QMAPP.FJC.DAL.Operation
             return count;
         }
 
+        public int InsertExchangeProduct(string MainCode,string ProductCode)
+        {
+            int count = 0;
+            string sql = $"INSERT INTO T_MD_ExchangeProduct (PID, MainCode, ProductCode) VALUES (NEWID(), '{MainCode}', '{ProductCode}');";
+            using (IDataSession session = AppDataFactory.CreateMainSession())
+            {
+                string sqlChange = base.ChangeSqlByDB(sql, session);
+                //删除基本信息
+                count = session.ExecuteSql(sqlChange);
+            }
+            return count;
+        }
+
         /// <summary>
         /// 
         /// </summary>

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

@@ -49,7 +49,6 @@ namespace QMAPP.FJC.TRACING.DAHandler
             StringBuilder log = new StringBuilder();
             try
             {
-                
                 System.Diagnostics.Stopwatch stopwatch = new System.Diagnostics.Stopwatch();
                 log.AppendFormat("{0},{1},{2}\t", Args.WorkLocCode, Args.DACode, Args.DAValue);
                 stopwatch.Start();
@@ -59,9 +58,9 @@ namespace QMAPP.FJC.TRACING.DAHandler
                 stopwatch.Stop();
                 log.AppendFormat("INITDA:{0}ms\t", stopwatch.ElapsedMilliseconds);
                 stopwatch.Start();
-
+                
                 AnalyzeData(data);//解析数据
-
+                
                 stopwatch.Stop();
                 log.AppendFormat("ANADA:{0}ms\t", stopwatch.ElapsedMilliseconds);
                 stopwatch.Start();
@@ -117,9 +116,9 @@ namespace QMAPP.FJC.TRACING.DAHandler
                 stopwatch.Stop();
                 log.AppendFormat("CHECKDA:{0}ms\t", stopwatch.ElapsedMilliseconds);
                 stopwatch.Start();
-
+                
                 var vresult = ValidateData(data);//校验数据
-
+                
                 stopwatch.Stop();
                 log.AppendFormat("VALIDDA:{0}ms\t", stopwatch.ElapsedMilliseconds);
                 stopwatch.Start();
@@ -138,20 +137,19 @@ namespace QMAPP.FJC.TRACING.DAHandler
                 stopwatch.Stop();
                 log.AppendFormat("SETCH:{0}ms\t", stopwatch.ElapsedMilliseconds);
                 stopwatch.Start();
-
+                
                 CheckState(data, result);//检查状态变化
-
+                
                 stopwatch.Stop();
                 log.AppendFormat("STCHANGE:{0}ms\t", stopwatch.ElapsedMilliseconds);
                 stopwatch.Start();
 
                 
-
                 data.DataSession.OpenTs();//开启事务
                 data.PersistEntitys();
                 data.ExcuteSQL();
                 data.DataSession.CommitTs();//提交事务
-
+                
                 stopwatch.Stop();
                 log.AppendFormat("EXECSQL:{0}ms\t", stopwatch.ElapsedMilliseconds);
                 stopwatch.Start();

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

@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using QMAPP.FJC.TRACING.DAInterface;
+using QMAPP.FJC.Entity.InterfaceData;
+using System.Text.RegularExpressions;
+using QMAPP.FJC.Entity.Operation;
+
+namespace QMAPP.FJC.TRACING.DataValidators
+{
+    /// <summary>
+    /// 气囊焊接工位验证 绑定条码 是否经过压合工位
+    /// </summary>
+    public class BFRecordValidator : IDataValidator
+    {
+        public ValidateResult Validate(DAObject data, Entity.QT.DAIValidation validOption)
+        {
+            if (!string.Equals(data.DAI.DATA_TYPE, "SN")) //采集点类型为SN
+            {
+                return new ValidateResult(true, "");
+            }
+            if (validOption == null || string.IsNullOrEmpty(validOption.ITEM_CODE))
+            {
+                return new ValidateResult(true, "");
+            }
+
+            DAL.Produce.ProductDAL pdal = new DAL.Produce.ProductDAL();
+            var product = data.GetObjectFromCache<Product>(p => p.PID == data.ObjectPID);
+            if (product == null)
+            {
+                product = pdal.GetByPID(data.ObjectPID);
+                if (product == null)
+                {
+                    throw new Exception("查找零件信息失败！");
+                }
+                data.ObjectCacheList.Add(product);
+            }
+            List<string> productCodes = new List<string>();
+            if (!string.IsNullOrEmpty(validOption.STD_VALUE) //用正则表达式匹配是否是需要检验的条码
+                && System.Text.RegularExpressions.Regex.IsMatch(product.PRODUCTCODE, validOption.STD_VALUE))
+            {
+                productCodes.Add(product.PRODUCTCODE);
+
+                var parmDAL = new DAL.Basic.ProcessParameterDAL();
+                bool record = false;
+                foreach (var barcode in productCodes)
+                {
+                    record = parmDAL.BFParameterRecord(product.PRODUCTCODE);
+                    if (record)
+                    {
+                        break;
+                    }
+                }
+                if (record)
+                {
+                    return new ValidateResult(true, "");
+                }
+                else
+                {
+                    return new ValidateResult(false, string.Format("零件“{0}”的绑定条码，缺少压合操作数据！", product.PRODUCTCODE));
+                }
+            }
+            return new ValidateResult(true, "");
+
+        }
+    }
+}

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

@@ -101,10 +101,22 @@ namespace QMAPP.FJC.TRACING.DataValidators
                     {
                         workorderlist = workorderlist.Where(p => p.PID == data.OrderPlan.PID).ToList();
                     }
-                    var bomlist = bomdal.GetPbomByMaterialCode(data.MaterialCode);//或取与此当前输入物料相关的BOM
-                    if (!bomlist.Exists(p => workorderlist.Exists(o => p.PBOM_CODE == o.PBOM_CODE))) //当前使用的物料与工单BOM不匹配
+                    //
+                    if (data.WorkLocState.WORKCELL_CODE == "ASSEMBLE_BC316")
                     {
-                        return new ValidateResult(false, "使用的物料不符合当前下达的生产计划要求！");
+                        var bomlist = bomdal.GetPbomByMaterialCodeWithPlan(data.MaterialCode, workorder.PBOM_CODE);//或取与此当前输入物料相关的BOM
+                        if (!bomlist.Exists(p => workorderlist.Exists(o => p.PBOM_CODE == o.PBOM_CODE))) //当前使用的物料与工单BOM不匹配
+                        {
+                            return new ValidateResult(false, "使用的物料不符合当前下达的生产计划要求！");
+                        }
+                    }
+                    else
+                    {
+                        var bomlist = bomdal.GetPbomByMaterialCode(data.MaterialCode);//或取与此当前输入物料相关的BOM
+                        if (!bomlist.Exists(p => workorderlist.Exists(o => p.PBOM_CODE == o.PBOM_CODE))) //当前使用的物料与工单BOM不匹配
+                        {
+                            return new ValidateResult(false, "使用的物料不符合当前下达的生产计划要求！");
+                        }
                     }
                 }
             }

APPQ5/QMAPP.FJC.TRACING/QMAPP.FJC.TRACING.csproj

@@ -89,6 +89,7 @@
     <Compile Include="DataValidators\LightOff.cs" />
     <Compile Include="DataValidators\LightOn.cs" />
     <Compile Include="DataValidators\OrderSEQValidator.cs" />
+    <Compile Include="DataValidators\BFRecordValidator.cs" />
     <Compile Include="DataValidators\PlanValidator.cs" />
     <Compile Include="DataValidators\ProductTimeValidator.cs" />
     <Compile Include="DataValidators\TimeValidator.cs" />

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"/>
    
@@ -59,10 +59,10 @@
     
     <add name="maindb" connectionString="Data Source=10.111.144.99;Initial Catalog=ADIENT_CD_MES_20230930;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
     <add name="maindbBZD" connectionString="Data Source=10.111.144.99;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
-  -->
+
     <add name="maindb" connectionString="Data Source=10.111.144.111;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password01;" providerName="System.Data.SqlClient"/>
     <add name="maindbBZD" connectionString="Data Source=10.111.144.111;Initial Catalog=BZD;User Id=sa;Password=Password01;" providerName="System.Data.SqlClient"/>
-
+  -->
 
     <!--<add name="maindb" connectionString="Data Source=.;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Microsoft2008;" providerName="System.Data.SqlClient"/>
     <add name="maindbBZD" connectionString="Data Source=.;Initial Catalog=BZD;User Id=sa;Password=Microsoft2008;" providerName="System.Data.SqlClient"/>-->

APPQ5/QMAPP.WinForm/App.config

@@ -2,20 +2,22 @@
 <configuration>
   <connectionStrings>
     <!--主数据库连接-->
-    <!--
+
     <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.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"/>-->
 
 
  <!--
@@ -236,13 +238,13 @@
 
       <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="net.tcp://10.111.144.94:4444/OpcService" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IOpcService" contract="ServiceOpc.IOpcService" name="NetTcpBinding_IOpcService" />-->
-
-       <!--<endpoint address="http://10.111.144.97:8938/GeneralService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="CenterGeneralService.IGeneralService" name="BasicHttpBinding_IGeneralService" />
-      <endpoint address="http://10.111.144.97:8938/LoginService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="LoginService.ILoginService" name="BasicHttpBinding_ILoginService" />
+       <!--<endpoint address="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" />-->
 
       <!--<endpoint address="http://10.117.133.80:8939/GeneralService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="CenterGeneralService.IGeneralService" name="BasicHttpBinding_IGeneralService" />

APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.Designer.cs

@@ -61,6 +61,7 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
             this.panel2 = new System.Windows.Forms.Panel();
+            this.txtGlue = new System.Windows.Forms.Label();
             this.tBMat = new System.Windows.Forms.TextBox();
             this.cBoxVAN = new System.Windows.Forms.CheckBox();
             this.btnChange = new System.Windows.Forms.Button();
@@ -163,7 +164,6 @@
             this.PType = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.OPERATESTATE = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.timer1 = new System.Windows.Forms.Timer(this.components);
-            this.txtGlue = new System.Windows.Forms.Label();
             this.panel2.SuspendLayout();
             this.panelSearch.SuspendLayout();
             this.plDAI.SuspendLayout();
@@ -201,18 +201,28 @@
             this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.panel2.Location = new System.Drawing.Point(0, 0);
-            this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panel2.Margin = new System.Windows.Forms.Padding(4);
             this.panel2.Name = "panel2";
             this.panel2.Size = new System.Drawing.Size(2524, 222);
             this.panel2.TabIndex = 15;
             // 
+            // txtGlue
+            // 
+            this.txtGlue.AutoSize = true;
+            this.txtGlue.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.txtGlue.Location = new System.Drawing.Point(34, 73);
+            this.txtGlue.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.txtGlue.Name = "txtGlue";
+            this.txtGlue.Size = new System.Drawing.Size(0, 30);
+            this.txtGlue.TabIndex = 14;
+            // 
             // tBMat
             // 
             this.tBMat.BackColor = System.Drawing.SystemColors.InactiveBorder;
             this.tBMat.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.tBMat.Font = new System.Drawing.Font("微软雅黑", 24F, System.Drawing.FontStyle.Bold);
             this.tBMat.Location = new System.Drawing.Point(1160, 152);
-            this.tBMat.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.tBMat.Margin = new System.Windows.Forms.Padding(4);
             this.tBMat.Name = "tBMat";
             this.tBMat.Size = new System.Drawing.Size(502, 64);
             this.tBMat.TabIndex = 13;
@@ -221,7 +231,7 @@
             // 
             this.cBoxVAN.AutoSize = true;
             this.cBoxVAN.Location = new System.Drawing.Point(1248, 40);
-            this.cBoxVAN.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.cBoxVAN.Margin = new System.Windows.Forms.Padding(4);
             this.cBoxVAN.Name = "cBoxVAN";
             this.cBoxVAN.Size = new System.Drawing.Size(70, 28);
             this.cBoxVAN.TabIndex = 12;
@@ -233,7 +243,7 @@
             // 
             this.btnChange.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnChange.Location = new System.Drawing.Point(1587, 26);
-            this.btnChange.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnChange.Margin = new System.Windows.Forms.Padding(4);
             this.btnChange.Name = "btnChange";
             this.btnChange.Size = new System.Drawing.Size(144, 46);
             this.btnChange.TabIndex = 11;
@@ -248,7 +258,7 @@
             this.cbMould.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.cbMould.FormattingEnabled = true;
             this.cbMould.Location = new System.Drawing.Point(1342, 27);
-            this.cbMould.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.cbMould.Margin = new System.Windows.Forms.Padding(4);
             this.cbMould.Name = "cbMould";
             this.cbMould.Size = new System.Drawing.Size(224, 39);
             this.cbMould.TabIndex = 10;
@@ -260,12 +270,12 @@
             this.lblError.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.lblError.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.lblError.Font = new System.Drawing.Font("微软雅黑", 24F, System.Drawing.FontStyle.Bold);
-            this.lblError.Location = new System.Drawing.Point(0, 81);
-            this.lblError.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.lblError.Location = new System.Drawing.Point(0, 107);
+            this.lblError.Margin = new System.Windows.Forms.Padding(4);
             this.lblError.Multiline = true;
             this.lblError.Name = "lblError";
             this.lblError.ReadOnly = true;
-            this.lblError.Size = new System.Drawing.Size(2524, 141);
+            this.lblError.Size = new System.Drawing.Size(2524, 115);
             this.lblError.TabIndex = 9;
             this.lblError.Text = "文字信息";
             // 
@@ -288,7 +298,7 @@
             this.comMachine.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.comMachine.FormattingEnabled = true;
             this.comMachine.Location = new System.Drawing.Point(946, 27);
-            this.comMachine.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.comMachine.Margin = new System.Windows.Forms.Padding(4);
             this.comMachine.Name = "comMachine";
             this.comMachine.Size = new System.Drawing.Size(290, 39);
             this.comMachine.TabIndex = 7;
@@ -298,7 +308,7 @@
             // 
             this.btnAdd.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnAdd.Location = new System.Drawing.Point(694, 26);
-            this.btnAdd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnAdd.Margin = new System.Windows.Forms.Padding(4);
             this.btnAdd.Name = "btnAdd";
             this.btnAdd.Size = new System.Drawing.Size(98, 46);
             this.btnAdd.TabIndex = 6;
@@ -311,7 +321,7 @@
             this.txtCode.Font = new System.Drawing.Font("微软雅黑", 12F);
             this.txtCode.ImeMode = System.Windows.Forms.ImeMode.Disable;
             this.txtCode.Location = new System.Drawing.Point(135, 27);
-            this.txtCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtCode.Margin = new System.Windows.Forms.Padding(4);
             this.txtCode.Name = "txtCode";
             this.txtCode.Size = new System.Drawing.Size(548, 39);
             this.txtCode.TabIndex = 5;
@@ -362,7 +372,7 @@
             this.panelSearch.Dock = System.Windows.Forms.DockStyle.Top;
             this.panelSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.panelSearch.Location = new System.Drawing.Point(0, 222);
-            this.panelSearch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panelSearch.Margin = new System.Windows.Forms.Padding(4);
             this.panelSearch.Name = "panelSearch";
             this.panelSearch.Size = new System.Drawing.Size(2524, 52);
             this.panelSearch.TabIndex = 17;
@@ -426,7 +436,7 @@
             this.plDAI.Controls.Add(this.DGView);
             this.plDAI.Dock = System.Windows.Forms.DockStyle.Top;
             this.plDAI.Location = new System.Drawing.Point(0, 274);
-            this.plDAI.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.plDAI.Margin = new System.Windows.Forms.Padding(4);
             this.plDAI.Name = "plDAI";
             this.plDAI.Size = new System.Drawing.Size(2524, 190);
             this.plDAI.TabIndex = 18;
@@ -469,7 +479,7 @@
             this.DGView.Dock = System.Windows.Forms.DockStyle.Fill;
             this.DGView.GridColor = System.Drawing.SystemColors.ControlDarkDark;
             this.DGView.Location = new System.Drawing.Point(0, 0);
-            this.DGView.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.DGView.Margin = new System.Windows.Forms.Padding(4);
             this.DGView.Name = "DGView";
             this.DGView.ReadOnly = true;
             dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
@@ -855,7 +865,7 @@
             this.panel4.Controls.Add(this.plPlanAndRecord);
             this.panel4.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panel4.Location = new System.Drawing.Point(0, 464);
-            this.panel4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panel4.Margin = new System.Windows.Forms.Padding(4);
             this.panel4.Name = "panel4";
             this.panel4.Padding = new System.Windows.Forms.Padding(0, 4, 0, 0);
             this.panel4.Size = new System.Drawing.Size(2524, 106);
@@ -868,9 +878,9 @@
             this.plInfo.Controls.Add(this.btnCollapse);
             this.plInfo.Dock = System.Windows.Forms.DockStyle.Right;
             this.plInfo.Location = new System.Drawing.Point(1230, 4);
-            this.plInfo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.plInfo.Margin = new System.Windows.Forms.Padding(4);
             this.plInfo.Name = "plInfo";
-            this.plInfo.Padding = new System.Windows.Forms.Padding(8, 8, 8, 8);
+            this.plInfo.Padding = new System.Windows.Forms.Padding(8);
             this.plInfo.Size = new System.Drawing.Size(1294, 102);
             this.plInfo.TabIndex = 1;
             this.plInfo.Visible = false;
@@ -881,9 +891,9 @@
             this.gbMlist.Dock = System.Windows.Forms.DockStyle.Fill;
             this.gbMlist.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.gbMlist.Location = new System.Drawing.Point(62, 8);
-            this.gbMlist.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.gbMlist.Margin = new System.Windows.Forms.Padding(4);
             this.gbMlist.Name = "gbMlist";
-            this.gbMlist.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.gbMlist.Padding = new System.Windows.Forms.Padding(4);
             this.gbMlist.Size = new System.Drawing.Size(1224, 86);
             this.gbMlist.TabIndex = 0;
             this.gbMlist.TabStop = false;
@@ -898,7 +908,7 @@
             this.dgcMListQty});
             this.dgvMlist.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvMlist.Location = new System.Drawing.Point(4, 41);
-            this.dgvMlist.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.dgvMlist.Margin = new System.Windows.Forms.Padding(4);
             this.dgvMlist.Name = "dgvMlist";
             this.dgvMlist.ReadOnly = true;
             this.dgvMlist.RowHeadersVisible = false;
@@ -940,7 +950,7 @@
             this.btnCollapse.Dock = System.Windows.Forms.DockStyle.Left;
             this.btnCollapse.Image = global::QMAPP.WinForm.Resource1.back;
             this.btnCollapse.Location = new System.Drawing.Point(8, 8);
-            this.btnCollapse.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnCollapse.Margin = new System.Windows.Forms.Padding(4);
             this.btnCollapse.Name = "btnCollapse";
             this.btnCollapse.Size = new System.Drawing.Size(54, 86);
             this.btnCollapse.TabIndex = 1;
@@ -958,7 +968,7 @@
             this.plPlanAndRecord.Controls.Add(this.tabView);
             this.plPlanAndRecord.Dock = System.Windows.Forms.DockStyle.Fill;
             this.plPlanAndRecord.Location = new System.Drawing.Point(0, 4);
-            this.plPlanAndRecord.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.plPlanAndRecord.Margin = new System.Windows.Forms.Padding(4);
             this.plPlanAndRecord.Name = "plPlanAndRecord";
             this.plPlanAndRecord.Size = new System.Drawing.Size(2524, 102);
             this.plPlanAndRecord.TabIndex = 0;
@@ -974,7 +984,7 @@
             "隐藏挂起工单",
             "只看挂起工单"});
             this.cbPlanFilter.Location = new System.Drawing.Point(1822, 2);
-            this.cbPlanFilter.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.cbPlanFilter.Margin = new System.Windows.Forms.Padding(4);
             this.cbPlanFilter.Name = "cbPlanFilter";
             this.cbPlanFilter.Size = new System.Drawing.Size(212, 44);
             this.cbPlanFilter.TabIndex = 17;
@@ -1003,7 +1013,7 @@
             "50",
             "100"});
             this.cbListRowcount.Location = new System.Drawing.Point(2167, 2);
-            this.cbListRowcount.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.cbListRowcount.Margin = new System.Windows.Forms.Padding(4);
             this.cbListRowcount.Name = "cbListRowcount";
             this.cbListRowcount.Size = new System.Drawing.Size(115, 44);
             this.cbListRowcount.TabIndex = 15;
@@ -1022,7 +1032,7 @@
             "15s",
             "20s"});
             this.cbRefreshRate.Location = new System.Drawing.Point(2415, 2);
-            this.cbRefreshRate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.cbRefreshRate.Margin = new System.Windows.Forms.Padding(4);
             this.cbRefreshRate.Name = "cbRefreshRate";
             this.cbRefreshRate.Size = new System.Drawing.Size(97, 44);
             this.cbRefreshRate.TabIndex = 14;
@@ -1057,7 +1067,7 @@
             this.tabView.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.tabView.ItemSize = new System.Drawing.Size(120, 32);
             this.tabView.Location = new System.Drawing.Point(0, 0);
-            this.tabView.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.tabView.Margin = new System.Windows.Forms.Padding(4);
             this.tabView.Name = "tabView";
             this.tabView.SelectedIndex = 0;
             this.tabView.Size = new System.Drawing.Size(2524, 102);
@@ -1069,7 +1079,7 @@
             this.tpPlan.Controls.Add(this.dgvPlan);
             this.tpPlan.Controls.Add(this.tlpPlanCount);
             this.tpPlan.Location = new System.Drawing.Point(4, 36);
-            this.tpPlan.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.tpPlan.Margin = new System.Windows.Forms.Padding(4);
             this.tpPlan.Name = "tpPlan";
             this.tpPlan.Size = new System.Drawing.Size(2516, 62);
             this.tpPlan.TabIndex = 0;
@@ -1105,7 +1115,7 @@
             this.dataGridViewTextBoxColumn11});
             this.dgvPlan.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvPlan.Location = new System.Drawing.Point(0, 0);
-            this.dgvPlan.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.dgvPlan.Margin = new System.Windows.Forms.Padding(4);
             this.dgvPlan.Name = "dgvPlan";
             this.dgvPlan.ReadOnly = true;
             dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
@@ -1246,7 +1256,7 @@
             this.tlpPlanCount.Controls.Add(this.label4, 0, 2);
             this.tlpPlanCount.Dock = System.Windows.Forms.DockStyle.Right;
             this.tlpPlanCount.Location = new System.Drawing.Point(2268, 0);
-            this.tlpPlanCount.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.tlpPlanCount.Margin = new System.Windows.Forms.Padding(4);
             this.tlpPlanCount.Name = "tlpPlanCount";
             this.tlpPlanCount.RowCount = 8;
             this.tlpPlanCount.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 9.774436F));
@@ -1360,9 +1370,9 @@
             // 
             this.tpRecord.Controls.Add(this.DGViewProList);
             this.tpRecord.Location = new System.Drawing.Point(4, 36);
-            this.tpRecord.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.tpRecord.Margin = new System.Windows.Forms.Padding(4);
             this.tpRecord.Name = "tpRecord";
-            this.tpRecord.Size = new System.Drawing.Size(2539, 60);
+            this.tpRecord.Size = new System.Drawing.Size(2516, 62);
             this.tpRecord.TabIndex = 1;
             this.tpRecord.Text = "加工记录";
             this.tpRecord.UseVisualStyleBackColor = true;
@@ -1395,7 +1405,7 @@
             this.OPERATESTATE});
             this.DGViewProList.Dock = System.Windows.Forms.DockStyle.Fill;
             this.DGViewProList.Location = new System.Drawing.Point(0, 0);
-            this.DGViewProList.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.DGViewProList.Margin = new System.Windows.Forms.Padding(4);
             this.DGViewProList.Name = "DGViewProList";
             this.DGViewProList.ReadOnly = true;
             dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
@@ -1408,7 +1418,7 @@
             this.DGViewProList.RowHeadersDefaultCellStyle = dataGridViewCellStyle30;
             this.DGViewProList.RowTemplate.Height = 23;
             this.DGViewProList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.DGViewProList.Size = new System.Drawing.Size(2539, 60);
+            this.DGViewProList.Size = new System.Drawing.Size(2516, 62);
             this.DGViewProList.TabIndex = 5;
             this.DGViewProList.RowPrePaint += new System.Windows.Forms.DataGridViewRowPrePaintEventHandler(this.DGViewProList_RowPrePaint);
             // 
@@ -1522,16 +1532,6 @@
             this.timer1.Interval = 1000;
             this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
             // 
-            // txtGlue
-            // 
-            this.txtGlue.AutoSize = true;
-            this.txtGlue.Font = new System.Drawing.Font("微软雅黑", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtGlue.Location = new System.Drawing.Point(1862, 36);
-            this.txtGlue.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.txtGlue.Name = "txtGlue";
-            this.txtGlue.Size = new System.Drawing.Size(0, 30);
-            this.txtGlue.TabIndex = 14;
-            // 
             // OperationForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
@@ -1542,7 +1542,7 @@
             this.Controls.Add(this.plDAI);
             this.Controls.Add(this.panelSearch);
             this.Controls.Add(this.panel2);
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "OperationForm";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "加工操作";

APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs

@@ -610,6 +610,7 @@ namespace QMAPP.WinForm.Forms.Operation
 
             try
             {
+                
                 this.lblError.Text = "";
                 this.lblError.ForeColor = Color.Black;
                 this.lblError.BackColor = SystemColors.InactiveBorder;
@@ -684,7 +685,7 @@ namespace QMAPP.WinForm.Forms.Operation
                 #endregion
 
                 #region DQZhang 喷胶工位验证混胶时间 20220309
-
+               
                 //喷胶验证混胶时间工位
                 if (_scanGlueLocs.Length > 0 && _scanGlueLocs.Contains(_operationServiceParam.machineInfo.WORKLOC_CODE))
                 {
@@ -699,10 +700,10 @@ namespace QMAPP.WinForm.Forms.Operation
                         //DateTime gluetime = System.DateTime.Now;
                         //txtCfg.Text = "胶水时间:" + gluetime;
 
-                        txtGlue.Text = System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
-
+                        txtGlue.Text = "胶水时间:" + System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                       
                         UpdateAppConfigValue("Gluetime", System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
-
+                        
                         txtGlue.Visible = true;
                         //txtGlue0.Visible = true;
                         txtCode.Text = "";
@@ -722,7 +723,7 @@ namespace QMAPP.WinForm.Forms.Operation
                     else
                     {
                         //验证混胶时间
-                        DateTime PlacingDateTime = Convert.ToDateTime(txtGlue.Text);
+                        DateTime PlacingDateTime = Convert.ToDateTime(txtGlue.Text.Replace("胶水时间:", ""));
                         string PlacingTime = System.Configuration.ConfigurationManager.AppSettings["混胶时间"];
                         var timespan = (DateTime.Now - Convert.ToDateTime(PlacingDateTime)).TotalHours;
                         if (!string.IsNullOrEmpty(PlacingTime) && timespan > int.Parse(PlacingTime))
@@ -737,7 +738,7 @@ namespace QMAPP.WinForm.Forms.Operation
                     //return;
                 }
                 #endregion
-
+                
                 #region 条码格式解析
 
                 var dai = LocateDAI(productCode);
@@ -771,8 +772,17 @@ namespace QMAPP.WinForm.Forms.Operation
                 //if(string.IsNullOrEmpty(_cfgAutoProduct))
                 //    _cfgAutoProduct = productCode;
 
-                //采集点输入
-                var result = _agent.InvokeServiceFunction<DAResult>(B9IPCService.DAI_Input.ToString()
+                if (_operationServiceParam.machineInfo.WORKCELL_CODE == "LFRAME_WELDING_BC316")
+                    {
+                        lblMould.Text = "LFRAME_M1"; //BC316下体骨架焊接
+                    }
+                else if (_operationServiceParam.machineInfo.WORKCELL_CODE == "AIRDUCT_WELD_BC316")
+                {
+                    lblMould.Text = "AD_WELD_M1";//BC316多媒体支架
+                }
+
+                    //采集点输入
+                    var result = _agent.InvokeServiceFunction<DAResult>(B9IPCService.DAI_Input.ToString()
                                                                    , new DAArgs
                                                                    {
                                                                        WorkCellCode = dai.WORKCELL_CODE,
@@ -840,7 +850,7 @@ namespace QMAPP.WinForm.Forms.Operation
                         }
                     }
                 }
-
+                
                 if (!result.Success) //如果采集数据输入失败
                 {
                     //PlaySound.PlaySounds.Play(@errorSoundPath);
@@ -878,10 +888,10 @@ namespace QMAPP.WinForm.Forms.Operation
 
                     dai.MATERIAL_CODE = result.MATERIAL_CODE;
                     dai.Result = dai.Result = EnumGeter.ORDERTYPE.OK.GetHashCode().ToString();
-
+                    
                     //执行返回结果中包含的动作
                     DoResultActions(result);
-
+                   
                     this.txtCode.Text = "";
 
                     //PlaySound.PlaySounds.Play(@okSoundPath);
@@ -902,6 +912,7 @@ namespace QMAPP.WinForm.Forms.Operation
                 }
                 try
                 {
+                    
                     #region 工位自动输入采集点信息
                     //工位与配置  且经过所有的验证
                     if (result.Success && !string.IsNullOrEmpty(_lowCfgAutoSwitchLoc) && _lowCfgAutoSwitchLoc.Contains(_operationServiceParam.machineInfo.WORKLOC_CODE))
@@ -1146,6 +1157,7 @@ namespace QMAPP.WinForm.Forms.Operation
 
 
                     #endregion
+                    
                 }
                 catch (Exception ex)
                 {
@@ -1214,7 +1226,7 @@ namespace QMAPP.WinForm.Forms.Operation
                 txtCode.Focus();
               
                 GC.Collect();
-
+                
             }
             catch (Exception ex)
             {
@@ -1244,6 +1256,7 @@ namespace QMAPP.WinForm.Forms.Operation
             lblWorkcellState.Text = result.StateName;
             foreach (var act in result.Actions)
             {
+                
                 switch (act)
                 {
                     case "SUBMIT": //状态变化动作为 提交数据
@@ -1576,8 +1589,10 @@ namespace QMAPP.WinForm.Forms.Operation
             try
             {
                 #region 服务查询
+                
                 dataPage = _agent.InvokeServiceFunction<DataPage>(B9BasicService.MainOperationBLL_GetOperationListNew.ToString(), operationSearchModel, dataPage);
                 List<MainOperation> listOperetions = JsonConvertHelper.GetDeserialize<List<MainOperation>>(dataPage.Result.ToString());
+               
                 #endregion
                 this.DGViewProList.DataSource = listOperetions;
                 DGViewProList.ClearSelection();
@@ -2182,7 +2197,7 @@ namespace QMAPP.WinForm.Forms.Operation
             Material materialInfo = new Material();
             materialInfo.MATERIAL_CODE = product.MATERIAL_CODE;
             materialInfo.MATERIAL_NAME = product.MATERIAL_NAME;
-            DataResult<List<FJC.Entity.Operation.PrintCode>> resultList = _agent.InvokeServiceFunction<DataResult<List<FJC.Entity.Operation.PrintCode>>>("MainOperationBLL_GetPrintCodeForMP4", materialInfo);
+            DataResult<List<FJC.Entity.Operation.PrintCode>> resultList = _agent.InvokeServiceFunction<DataResult<List<FJC.Entity.Operation.PrintCode>>>("MainOperationBLL_GetPrintCodeForMP4D", materialInfo, processcode);
             
             try
             {

APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.resx

@@ -505,88 +505,88 @@
   <data name="tsbSearch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
         SUVORK5CYII=
 </value>
   </data>

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

@@ -68,9 +68,14 @@ namespace QMAPP.WinForm.Forms.TianJin
                     labeldata.Class = " " + book.Class.Substring(0, 2);
                     labeldata.Description = book.Text;
                     labeldata.OrderNo = book.CarModel + positioncode + data;
-                    if (MATERIAL_CODE.Contains("018D")|| MATERIAL_CODE.Contains("278D"))
+                    if (MATERIAL_CODE.Contains("018D") || MATERIAL_CODE.Contains("278D"))
                     {
-                        var bookS = _agent.InvokeServiceFunction<FJC.Entity.FIS.FISPhraseBook>("FISPhraseBLL_GetPHRASEBOOK", MATERIAL_CODE.Substring(5,3).Trim());
+                        var bookS = _agent.InvokeServiceFunction<FJC.Entity.FIS.FISPhraseBook>("FISPhraseBLL_GetPHRASEBOOK", MATERIAL_CODE.Substring(5, 3).Trim(), "");
+                        labeldata.Remark = bookS.Text;
+                    }
+                    else if (MATERIAL_CODE.Contains("493D"))
+                    {
+                        var bookS = _agent.InvokeServiceFunction<FJC.Entity.FIS.FISPhraseBook>("FISPhraseBLL_GetPHRASEBOOK", MATERIAL_CODE.Substring(5, 3).Trim(),"493D");
                         labeldata.Remark = bookS.Text;
                     }
                     
@@ -139,7 +144,7 @@ namespace QMAPP.WinForm.Forms.TianJin
                                             label.MATERIALCODE,//
                                             label.Remark
                                             );
-                if (label.OrderNo.Contains("018D") || label.OrderNo.Contains("278D"))
+                if (label.OrderNo.Contains("018D") || label.OrderNo.Contains("278D") || label.OrderNo.Contains("493D"))
                 {
                     TMPPath = "PlanLabelTMPPath8D";
                     DATPath = "PlanLabelDATPath8D";
@@ -282,6 +287,7 @@ namespace QMAPP.WinForm.Forms.TianJin
             list.Add(new Linese() { NAME = "018D", CODE = "018D" });
             list.Add(new Linese() { NAME = "770B", CODE = "770B" });
             list.Add(new Linese() { NAME = "278D", CODE = "278D" });
+            list.Add(new Linese() { NAME = "493D", CODE = "493D" });
             this.Lines.DataSource = list;
             this.Lines.DisplayMember = "NAME";
             this.Lines.ValueMember = "CODE";

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

@@ -1217,8 +1217,11 @@ namespace QMAPP.WinForm.Forms.TianJin
                         plan.QTY = defaultNum/2;
                         if (mach.Substring(0, 3) == "770")
                             plan.LINENO = "770B";
-                        else
+                        else if(mach.Substring(0, 3) == "018")
                             plan.LINENO = "018D";
+                        else if(mach.Substring(0, 3) == "493")
+                            plan.LINENO = "493D";
+
                         if (plan.LINENO == "770B")
                         {
                             foreach (var s in "R,F".Split(','))

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

@@ -118,7 +118,7 @@ namespace QMAPP.WinForm.Forms.TianJin
                 dataPage.PageIndex = 1;
                 dataPage.SortExpression = " ROWVALUE ASC";
 
-                if (cbRoutes.Text.Contains("018D") || cbRoutes.Text.Contains("278D"))
+                if (cbRoutes.Text.Contains("018D") || cbRoutes.Text.Contains("278D") || cbRoutes.Text.Contains("493D"))
                 {
                     var count = Convert.ToInt32(cbListRowcount.Text) / 2;
                     var orderlist = new List<FJC.Entity.ProductionPlan.WorkOrder>();
@@ -267,7 +267,7 @@ namespace QMAPP.WinForm.Forms.TianJin
                                             label.MATERIALCODE,//
                                             label.Remark
                                             );
-                if (label.OrderNo.Contains("018D") || label.OrderNo.Contains("278D"))
+                if (label.OrderNo.Contains("018D") || label.OrderNo.Contains("278D") || label.OrderNo.Contains("493D"))
                 {
                     TMPPath = "PlanLabelTMPPath8D";
                     DATPath = "PlanLabelDATPath8D";
@@ -548,9 +548,14 @@ namespace QMAPP.WinForm.Forms.TianJin
                     labeldata.Class = " " + book.CarModel.Substring(book.CarModel.Length - 3, 3);
                     labeldata.Description = book.Text;
                     labeldata.OrderNo = book.CarModel + positioncode + data;
-                    if (orders[0].MATERIAL_CODE.Contains("018D")|| orders[0].MATERIAL_CODE.Contains("278D"))
+                    if (orders[0].MATERIAL_CODE.Contains("018D") || orders[0].MATERIAL_CODE.Contains("278D"))
                     {
-                        var bookS = _agent.InvokeServiceFunction<FJC.Entity.FIS.FISPhraseBook>("FISPhraseBLL_GetPHRASEBOOK", labeldata.Class.Trim());
+                        var bookS = _agent.InvokeServiceFunction<FJC.Entity.FIS.FISPhraseBook>("FISPhraseBLL_GetPHRASEBOOK", labeldata.Class.Trim(),"");
+                        labeldata.Remark = bookS.Text;
+                    }
+                    else if (orders[0].MATERIAL_CODE.Contains("493D"))
+                    {
+                        var bookS = _agent.InvokeServiceFunction<FJC.Entity.FIS.FISPhraseBook>("FISPhraseBLL_GetPHRASEBOOK", labeldata.Class.Trim(), "493D");
                         labeldata.Remark = bookS.Text;
                     }
                 }
@@ -711,7 +716,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)) && !orders[0].MATERIAL_CODE.Contains("018D") && !orders[0].MATERIAL_CODE.Contains("278D"))
+                    if ((orders[0].MATERIAL_NAME.Substring(0, 7) != orders2[0].MATERIAL_NAME.Substring(0, 7)) && !orders[0].MATERIAL_CODE.Contains("018D") && !orders[0].MATERIAL_CODE.Contains("278D") && !orders[0].MATERIAL_CODE.Contains("493D"))
                     {
                         MessageBox.Show("计划工单即将变换配置，请注意！");
                     }
@@ -738,9 +743,14 @@ namespace QMAPP.WinForm.Forms.TianJin
                     labeldata.Class = " " + book.Class.Substring(0, 2);
                     labeldata.Description = book.Text;
                     labeldata.OrderNo = book.CarModel + positioncode + data;
-                    if (orders[0].MATERIAL_CODE.Contains("018D")|| orders[0].MATERIAL_CODE.Contains("278D"))
+                    if (orders[0].MATERIAL_CODE.Contains("018D") || orders[0].MATERIAL_CODE.Contains("278D"))
+                    {
+                        var bookS = _agent.InvokeServiceFunction<FJC.Entity.FIS.FISPhraseBook>("FISPhraseBLL_GetPHRASEBOOK", orders[0].MATERIAL_CODE.Substring(5, 3).Trim(),"");
+                        labeldata.Remark = bookS.Text;
+                    }
+                    else if (orders[0].MATERIAL_CODE.Contains("493D"))
                     {
-                        var bookS = _agent.InvokeServiceFunction<FJC.Entity.FIS.FISPhraseBook>("FISPhraseBLL_GetPHRASEBOOK", orders[0].MATERIAL_CODE.Substring(5, 3).Trim());
+                        var bookS = _agent.InvokeServiceFunction<FJC.Entity.FIS.FISPhraseBook>("FISPhraseBLL_GetPHRASEBOOK", orders[0].MATERIAL_CODE.Substring(5, 3).Trim(),"493D");
                         labeldata.Remark = bookS.Text;
                     }
 

APPQ5/QMAPP.WinForm/Menu.xml

@@ -13,6 +13,7 @@
   <PowerInfo PowerID="CD81030100" PowerDes="条码打印" ButtonName="btnInjectPrint" />
   <PowerInfo PowerID="CD81030200" PowerDes="工位调整" FormName="InjectionCodePrint" ButtonName="btnLockMachine" />
   <PowerInfo PowerID="CD81030300" PowerDes="模板调整" FormName="InjectionCodePrint" ButtonName="cbTemplateDesign" />
+  <PowerInfo PowerID="CD81040000" PowerDes="缝纫条码打印" ButtonName="btnSewingPrint"/>
 
   <PowerInfo PowerID="CD82000000" ButtonName=""/>
   <PowerInfo PowerID="CD82010000" ButtonName=""/>

APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs

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

ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config

@@ -71,23 +71,23 @@
 
   <add name="maindb" connectionString="Data Source=10.111.144.99;Initial Catalog=ADIENT_CD_MES_20230930;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
   <add name="maindbBZD" connectionString="Data Source=10.111.144.99;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
- -->
-    
-      <add name="maindb" connectionString="Data Source=10.111.144.111;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password01;" providerName="System.Data.SqlClient"/>
-  <add name="maindbBZD" connectionString="Data Source=10.111.144.111;Initial Catalog=BZD;User Id=sa;Password=Password01;" providerName="System.Data.SqlClient"/>
 
-    
-  <!--
+    -->
+<add name="maindb" connectionString="Data Source=10.111.144.111;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password01;" providerName="System.Data.SqlClient"/>
+<add name="maindbBZD" connectionString="Data Source=10.111.144.111;Initial Catalog=BZD;User Id=sa;Password=Password01;" providerName="System.Data.SqlClient"/>
+
+
+<!--
     <add name="maindbYBB" connectionString="Data Source=10.111.144.72;Initial Catalog=scCFAACDYBNCSNF;User Id=mesreaderdcs;Password=mesreaderdcs;" providerName="System.Data.SqlClient"/>
     <add name="maindbNCSYBB" connectionString="Data Source=10.111.144.72;Initial Catalog=scCFAACDYBDY;User Id=mesreaderdcs;Password=mesreaderdcs;" providerName="System.Data.SqlClient"/>-->
 
 
     <!--<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"/>-->