diff --git a/APPQ5/QMAPP.FJC.DAL/ProduceManage/MendRecorderDAL.cs b/APPQ5/QMAPP.FJC.DAL/ProduceManage/MendRecorderDAL.cs
index aad0ea6..496430f 100644
--- a/APPQ5/QMAPP.FJC.DAL/ProduceManage/MendRecorderDAL.cs
+++ b/APPQ5/QMAPP.FJC.DAL/ProduceManage/MendRecorderDAL.cs
@@ -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 ");
diff --git a/APPQ5/QMAPP.WinForm/App.config b/APPQ5/QMAPP.WinForm/App.config
index 18687e2..6ed6c4e 100644
--- a/APPQ5/QMAPP.WinForm/App.config
+++ b/APPQ5/QMAPP.WinForm/App.config
@@ -4,11 +4,11 @@
-
+
+
-
-
+
diff --git a/APPQ5/QMAPP.WinForm/Forms/DisPatch/FrmPlace.cs b/APPQ5/QMAPP.WinForm/Forms/DisPatch/FrmPlace.cs
index 398580a..0e305fe 100644
--- a/APPQ5/QMAPP.WinForm/Forms/DisPatch/FrmPlace.cs
+++ b/APPQ5/QMAPP.WinForm/Forms/DisPatch/FrmPlace.cs
@@ -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
diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
index 288cf49..0b3e916 100644
--- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
+++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
@@ -68,15 +68,15 @@
-
+
+
-
-
+