From f923565171ce993bce3a6e23df93cacb83593552 Mon Sep 17 00:00:00 2001
From: "songnan.zhang" <songnan.zhang@ccwin-in.com>
Date: Fri, 17 Dec 2021 16:00:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E9=83=BD=E8=87=AA=E5=8A=A8=E6=89=AB?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 APPQ5/QMAPP.WinForm/App.config                |  6 ++---
 .../Forms/Operation/OperationForm.cs          | 26 ++++++++++++++++++-
 .../WCF/OpcServerHost/OpcDeal/ParaInit.cs     |  5 ++--
 .../WCF/QMFrameWork.WebServiceHost/Web.config |  4 +--
 4 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/APPQ5/QMAPP.WinForm/App.config b/APPQ5/QMAPP.WinForm/App.config
index 2d53515..7ae6ef7 100644
--- a/APPQ5/QMAPP.WinForm/App.config
+++ b/APPQ5/QMAPP.WinForm/App.config
@@ -6,8 +6,8 @@
     <add name="maindbBZD" connectionString="Data Source=119.3.213.202,13315;Initial Catalog=BZD;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=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_MES9;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"/>
 
   </connectionStrings>
 
@@ -180,7 +180,7 @@
       
       <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.97:4444/OpcService" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IOpcService" contract="ServiceOpc.IOpcService" name="NetTcpBinding_IOpcService" />
+      <endpoint address="net.tcp://10.111.144.99:4444/OpcService" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IOpcService" contract="ServiceOpc.IOpcService" name="NetTcpBinding_IOpcService" />
       
       <!--<endpoint address="net.tcp://localhost:4444/OpcService" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IOpcService" contract="ServiceOpc.IOpcService" name="NetTcpBinding_IOpcService" />
       <endpoint address="http://localhost:8938/GeneralService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="CenterGeneralService.IGeneralService" name="BasicHttpBinding_IGeneralService" />
diff --git a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs
index 08b0beb..cd1b039 100644
--- a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs
+++ b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs
@@ -2179,7 +2179,31 @@ namespace QMAPP.WinForm.Forms.Operation
                     }
                     else
                     {
-                        DAInput(message, "PARM");
+                        
+                        if ("DPWELDING_L".Contains(_operationServiceParam.machineInfo.MACHINECODDE))
+                        {
+                            List<ParameterConfig> list = QMFrameWork.Common.Serialization.JsonConvertHelper.GetDeserialize<List<ParameterConfig>>(message);
+                            if (list.Count <= 0)
+                            {
+                                this.lblError.Text = "没有条码，请检查服务！";
+                                this.lblError.ForeColor = Color.Red;
+                                return;
+                            }
+                            foreach (var t in list)
+                            {
+                                if (_operationServiceParam.machineInfo.MACHINECODDE == t.MACHINECODDE && t.COLUMNTYPE == "8")
+                                {
+                                    txtCode.Text = t.PARAVALUE.ToString().Trim();
+                                    Operation();
+                                }
+                            }
+
+                        }
+                        else
+                        {
+                            DAInput(message, "PARM");
+                        }
+                        
                         return;
                     }
 
diff --git a/ServicesCenter/WCF/OpcServerHost/OpcDeal/ParaInit.cs b/ServicesCenter/WCF/OpcServerHost/OpcDeal/ParaInit.cs
index 14d2566..8e082c9 100644
--- a/ServicesCenter/WCF/OpcServerHost/OpcDeal/ParaInit.cs
+++ b/ServicesCenter/WCF/OpcServerHost/OpcDeal/ParaInit.cs
@@ -743,9 +743,10 @@ namespace OpcServerHost.Init
                                     {
                                         string item = parameter.MACHINECODDE + ":" + parameter.MOLDNUMBER + ":" + parameter.COLUMNCODE;
 
-                                        var result = opcplcConnection.ReadtagValue(opcItemDict[item]);
+                                            //var result = opcplcConnection.ReadtagValue(opcItemDict[item]);
+                                            var result = (object)"[0.25.68.48.52.67.82.69.87.85.70.76.50.49.49.50.49.53.48.48.49.83.68.48.48.48.49]";
 
-                                        if (result != null)
+                                            if (result != null)
                                         {
                                                 ASCIIEncoding asciiEncoding = new ASCIIEncoding();
                                                 var product_str = result.ToString().Replace("[","").Replace("]", "").Split('.');
diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
index e40c46b..a4f328a 100644
--- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
+++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
@@ -66,13 +66,13 @@
 
     <!--<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;max pool size=10240;" providerName="System.Data.SqlClient"/>
+    <add name="maindb" connectionString="Data Source=10.111.144.99;Initial Catalog=ADIENT_CD_MES9;User Id=sa;Password=Password2018;max pool size=10240;" providerName="System.Data.SqlClient"/>
 
 
     <!--<add name="maindbYBB" connectionString="Data Source=10.111.144.72;Initial Catalog=CdFisYbbNCSNF;User Id=mesreaderdcs;Password=mesreaderdcs;" providerName="System.Data.SqlClient"/>
     <add name="maindbNCSYBB" connectionString="Data Source=10.111.144.72;Initial Catalog=CdFisYbbDY;User Id=mesreaderdcs;Password=mesreaderdcs;" 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.99;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
 
     <!--<add name="maindb" connectionString="Data Source=10.114.50.240;Initial Catalog=ADIENT_QD_MES;Persist Security Info=True;User ID=qdmes;Password=Password1;" providerName="System.Data.SqlClient"/>
     <add name="maindbMB" connectionString="Data Source=10.123.4.20;Initial Catalog=QdFisMB;Persist Security Info=True;User ID=sa;Password=qm;" providerName="System.Data.SqlClient"/>