From dcd03a9406075355bb282f551d2ba3aa78c7bd1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE=E7=94=B7?= <446507344@qq.com>
Date: Fri, 12 May 2023 09:57:38 +0800
Subject: [PATCH] 11

---
 .../TianJin/TJEPasteDetailsCard.cs            | 30 +++++++++++++++++++
 APPQ5/QMAPP.WinForm/App.config                |  6 ++--
 .../QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs | 11 ++++++-
 .../WCF/QMFrameWork.WebServiceHost/Web.config |  6 ++--
 4 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/APPQ5/QMAPP.FJC.Entity/TianJin/TJEPasteDetailsCard.cs b/APPQ5/QMAPP.FJC.Entity/TianJin/TJEPasteDetailsCard.cs
index 6227434..6de263d 100644
--- a/APPQ5/QMAPP.FJC.Entity/TianJin/TJEPasteDetailsCard.cs
+++ b/APPQ5/QMAPP.FJC.Entity/TianJin/TJEPasteDetailsCard.cs
@@ -165,5 +165,35 @@ namespace Model
         }
 
         public string KIN { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string MbConfig
+        {
+            get { return _mbconfig; }
+            set { _mbconfig = value; }
+        }
+        private string _mbconfig;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string MbOrientation
+        {
+            get { return _mborientation; }
+            set { _mborientation = value; }
+        }
+        private string _mborientation;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string CreateTime
+        {
+            get { return _createtime; }
+            set { _createtime = value; }
+        }
+        private string _createtime;
     }
 }
diff --git a/APPQ5/QMAPP.WinForm/App.config b/APPQ5/QMAPP.WinForm/App.config
index 2e3a5ad..a0a6871 100644
--- a/APPQ5/QMAPP.WinForm/App.config
+++ b/APPQ5/QMAPP.WinForm/App.config
@@ -3,11 +3,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="maindb" connectionString="Data Source=10.111.144.99;Initial Catalog=ADIENT_CD_MES;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"/>-->
    
 
@@ -22,7 +22,7 @@
     <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"/>
     
diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs
index 646d52e..a5a30f4 100644
--- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs
+++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs
@@ -2114,10 +2114,12 @@ namespace QMAPP.WinForm.Forms.TianJin
             dt.Columns.Add("CP5A");
             dt.Columns.Add("PRODUCTIONNAME");
             dt.Columns.Add("LINENO");
+            dt.Columns.Add("MbConfig");
+            dt.Columns.Add("MbOrientation");
+            dt.Columns.Add("CreateTime");
             int index = 1;
 
             QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
-            //DataTable tbl = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetPastecardDeatis.ToString());
             DataTable tbl = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.TJFrmPlaceBLL_GetPascardDetailsByPid.ToString(), nfpastecard.PASTE_CARD_KEY);
                 
             //index = Convert.ToInt32(tbl.Rows[0][0].ToString());
@@ -2143,6 +2145,13 @@ namespace QMAPP.WinForm.Forms.TianJin
                 ncsdr["SCANDATE"] = DateTime.Now.ToString();
                 ncsdr["PRODUCTIONNAME"] = strprodtype;
                 ncsdr["LINENO"] = tbl.Rows[i]["LINENO"].ToString();
+                if(tbl.Rows[i]["VIN"].ToString().Substring(0,3) == "770")
+                    ncsdr["MbConfig"] = tbl.Rows[i]["VIN"].ToString().Substring(3, 3);
+                else
+                    ncsdr["MbConfig"] = tbl.Rows[i]["VIN"].ToString().Substring(4, 3);
+
+                ncsdr["MbOrientation"] = strprodtype;
+                ncsdr["CreateTime"] = DateTime.Now.ToString("yyyy年MM月dd日 HH:mm");
                 dt.Rows.Add(ncsdr);
                 index++;
             }
diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
index c9ff77c..6260cda 100644
--- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
+++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
@@ -63,10 +63,10 @@
   <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="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"/>-->
 
@@ -88,7 +88,7 @@
 
    <!--<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"/>-->
 
-    <!--<add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>-->
+    <add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>
 
     <!--<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;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"/>-->