InOutPut
/
Put_MES
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Revert "11" 

This reverts commit dcd03a9406.
master
张松男 2 years ago
parent
dcd03a9406
commit
d96b1f1b76
4 changed files with 7 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      APPQ5/QMAPP.FJC.Entity/TianJin/TJEPasteDetailsCard.cs
  2. 6
      APPQ5/QMAPP.WinForm/App.config
  3. 11
      APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs
  4. 6
      ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config

30
APPQ5/QMAPP.FJC.Entity/TianJin/TJEPasteDetailsCard.cs
View File

@ -165,35 +165,5 @@ 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;
}
}

6
APPQ5/QMAPP.WinForm/App.config
View File

@ -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"/>

11
APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs
View File

@ -2114,12 +2114,10 @@ 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());
@ -2145,13 +2143,6 @@ 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++;
}

6
ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
View File

@ -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"/>-->

Write Preview
Loading…
Cancel
Save