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

1.发运工位未发数量车型更新。2.返修工位查询BUG完善。

master
dequan.zhang 3 years ago
parent
1d07fbacf0
commit
c4b1079a55
4 changed files with 23 additions and 15 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. 5
      APPQ5/QMAPP.FJC.DAL/ProduceManage/MendRecorderDAL.cs
  2. 8
      APPQ5/QMAPP.WinForm/App.config
  3. 17
      APPQ5/QMAPP.WinForm/Forms/DisPatch/FrmPlace.cs
  4. 8
      ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config

5
APPQ5/QMAPP.FJC.DAL/ProduceManage/MendRecorderDAL.cs
View File

@ -170,7 +170,8 @@ namespace QMAPP.FJC.DAL.ProduceManage
sqlBuilder.Append(" ,(M.ERP_WORKCELL+'/'+R3.MFGNAME) AS ERP_WORKCELL ");
sqlBuilder.Append(" ,(M.ERP_DEFECTTO+'/'+R4.MFGNAME) AS ERP_DEFECTTO ");
sqlBuilder.Append(" ,(M.ERP_PRODUCTTYPE+'/'+R5.MFGNAME) AS ERP_PRODUCTTYPE ");
sqlBuilder.Append(" ,(M.ERP_DEFECTCODE+'/'+R7.MFGNAME) AS ERP_DEFECTCODE ");
//sqlBuilder.Append(" ,(M.ERP_DEFECTCODE+'/'+R7.MFGNAME) AS ERP_DEFECTCODE ");
sqlBuilder.Append(" ,(M.ERP_DEFECTCODE+'/'+M.MENDREASON) AS ERP_DEFECTCODE ");
sqlBuilder.Append(" ,(M.ERP_MFGCODETYPE+M.ERP_CAR+M.ERP_WORKLINE+M.ERP_SHIFT+M.ERP_WORKCELL+M.ERP_DEFECTTO+M.ERP_PRODUCTTYPE+M.ERP_DEFECTCODE) as ERPS ");
sqlBuilder.Append(" ,MB.MACHINENAME ");
sqlBuilder.Append(" ,MA.MATERIAL_NAME ");
@ -185,7 +186,7 @@ namespace QMAPP.FJC.DAL.ProduceManage
sqlBuilder.Append(" LEFT JOIN T_AW_MENDRECORDERERP R4 ON R4.MFGCODE = M.ERP_DEFECTTO AND R4.MFGCODETYPE = 'DEFECTTO' ");
sqlBuilder.Append(" LEFT JOIN T_AW_MENDRECORDERERP R5 ON R5.MFGCODE = M.ERP_PRODUCTTYPE AND R5.MFGCODETYPE = 'PRODUCTTYPE' ");
sqlBuilder.Append(" LEFT JOIN T_AW_MENDRECORDERERP R6 ON R6.MFGCODE = M.ERP_WORKLINE AND R6.MFGCODETYPE = 'WORKLINE' ");
sqlBuilder.Append(" LEFT JOIN T_AW_MENDRECORDERERP R7 ON R7.MFGCODE = M.ERP_DEFECTCODE AND R7.MFGCODETYPE = 'DEFECTCODE' ");
//sqlBuilder.Append(" LEFT JOIN T_AW_MENDRECORDERERP R7 ON R7.MFGCODE = M.ERP_DEFECTCODE AND R7.MFGCODETYPE = 'DEFECTCODE' ");
sqlBuilder.Append(" LEFT JOIN T_AW_MENDRECORDERERP R8 ON R8.MFGCODE = M.ERP_MFGCODETYPE AND R8.MFGCODETYPE = 'MENDTYPE'");
sqlBuilder.Append(" LEFT JOIN T_BD_MACHINEINFO MB ON MB.MACHINECODDE=M.MACHINECODDE ");
sqlBuilder.Append(" LEFT JOIN T_MD_MATERIAL MA ON MA.MATERIAL_CODE=M.MATERIAL_CODE ");

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

@ -4,11 +4,11 @@
<!--主数据库连接-->
<!--<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"/>
<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"/>
<!--<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"/>-->
<!--<add name="maindb" connectionString="Data Source=123.56.115.74;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=qwe123$%^;" providerName="System.Data.SqlClient" />-->

17
APPQ5/QMAPP.WinForm/Forms/DisPatch/FrmPlace.cs
View File

@ -1019,12 +1019,19 @@ namespace QMAPP.WinForm.Forms.DisPatch
{
//BindingSource bin = (BindingSource)dgvMATChange.DataSource;
//DataTable tbl = (DataTable)dgvMATChange.DataSource;
//DataRow[] nfrows = tbl.Select("LINENO='NF'");
//DataRow[] ncsrows = tbl.Select("LINENO='NCS'");
//DataRow[] ncsnfrows = tbl.Select("LINENO='NCSNF'");
//DataRow[] ncsgprows = tbl.Select("LINENO='NCSGP'");
//lblCount.Text = "NCS: " + ncsrows.Length + " NF: " + nfrows.Length + " NCSNF: " + ncsnfrows.Length + " NCSGP: " + ncsgprows.Length;
DataTable tbl = (DataTable)dgvMATChange.DataSource;
DataRow[] nfrows = tbl.Select("LINENO='NF'");
DataRow[] ncsrows = tbl.Select("LINENO='NCS'");
DataRow[] ncsnfrows = tbl.Select("LINENO='NCSNF'");
DataRow[] ncsgprows = tbl.Select("LINENO='NCSGP'");
lblCount.Text = "NCS: " + ncsrows.Length + " NF: " + nfrows.Length + " NCSNF: " + ncsnfrows.Length + " NCSGP: " + ncsgprows.Length;
DataRow[] nfrows = tbl.Select("LINENO='NCSNFPA'");
DataRow[] ncsrows = tbl.Select("LINENO='PA311'");
DataRow[] ncsnfrows = tbl.Select("LINENO='A SUV'");
//DataRow[] ncsgprows = tbl.Select("LINENO='NCSGP'");
lblCount.Text = "NCSNFPA: " + nfrows.Length + " " + " PA311: " + ncsrows.Length + " " + " A SUV: " + ncsnfrows.Length;
}
#endregion

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

@ -68,15 +68,15 @@
<!--<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"/>-->
<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"/>
<!--<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=.;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"/>
<!--<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"/>-->

Write Preview
Loading…
Cancel
Save