inca Change interface rules from ID to name

OTSIncAReportApp/1-UI/OTSReportExport/DataIntegration/BasicData.cs

@@ -218,18 +218,30 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
 
 
 
-            //去除物质分类（非夹杂物分类）
-            for (int a = 0; a < m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass_Serial.Count; a++)
-            {
-                for (int i = m_bt_DBData.Rows.Count - 1; i >= 0; i--)
-                {
-                    if (m_bt_DBData.Rows[i]["TypeId"].ToString() == m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass_Serial[a].ToString())
-                    {
-                        m_bt_DBData.Rows.RemoveAt(i);
-                    }
-                }
-            }
-			
+            //去除物质分类（非夹杂物分类）//颗粒种类ID赛选
+            //for (int a = 0; a < m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass_Serial.Count; a++)
+            //{
+            //    for (int i = m_bt_DBData.Rows.Count - 1; i >= 0; i--)
+            //    {
+            //        if (m_bt_DBData.Rows[i]["TypeId"].ToString() == m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass_Serial[a].ToString())
+            //        {
+            //            m_bt_DBData.Rows.RemoveAt(i);
+            //        }
+            //    }
+            //}
+
+			//去除物质分类（非夹杂物分类）//颗粒种类名称赛选
+			for (int a = 0; a < m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass.Count; a++)
+			{
+				for (int i = m_bt_DBData.Rows.Count - 1; i >= 0; i--)
+				{
+					if (m_bt_DBData.Rows[i]["TypeName"].ToString() == m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass[a].ToString())
+					{
+						m_bt_DBData.Rows.RemoveAt(i);
+					}
+				}
+			}
+
 			GroupInformation = new List<string>();
 			for (int i = 0; i < m_bt_DBData.Rows.Count; i++)
 			{

OTSIncAReportApp/1-UI/OTSReportExport/INCA/OTSReport_Template_INCA.cs

@@ -14,6 +14,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Drawing;
 using System.IO;
+using System.Linq;
 using System.Net.Mail;
 using System.Windows.Forms;
 
@@ -387,7 +388,15 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             }
             m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass_Serial.Clear();
             m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass_Serial = DeleteClass_Serial.Copy();
-            m_OTSReport_Export.m_mbszclass.M_SY.LOGName = fileName;
+
+            m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass.Clear();
+            string[] result = delete_Class.Text.Split(',');
+            for (int i = 0; i < result.Count(); i++)
+            {
+                m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_str_kllb_DeleteClass.Add(result[i]);
+			}
+
+			m_OTSReport_Export.m_mbszclass.M_SY.LOGName = fileName;
             //首页
             m_OTSReport_Export.m_mbszclass.M_SY.str_tb_ZBT = tb_ZBT.Text;
             m_OTSReport_Export.m_mbszclass.M_SY.str_tb_FBT = tb_FBT.Text;