Merge branch 'Release2.3' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into Release2.3

OTSIncAReportApp/1-UI/OTSTemplateDesigner/Export_ReportTemplate.cs

@@ -430,7 +430,18 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             List<string> vs = new List<string>();
             DataTable data = new DataTable();
             //首先生成标记颗粒的帧图图像文件
-            m_otsreport_export.m_ReportApp.im_ParticlesGridDevidePage.SaveMarkParticleRectangleOnFieldFile(dt_ParticlesGridDevidePage ,out vs ,out data);
+            DataTable dt_GridDevidePage = new DataTable();
+            dt_GridDevidePage = dt_ParticlesGridDevidePage.Copy();
+            dt_GridDevidePage.Clear();
+            for (int i=0;i< dt_ParticlesGridDevidePage.Rows.Count;i++)
+            {
+                if (dt_ParticlesGridDevidePage.Rows[i]["TypeName"].ToString() != "Not Identified")
+                {
+                    dt_GridDevidePage.Rows.Add(dt_ParticlesGridDevidePage.Rows[i].ItemArray);
+                }
+            }
+
+            m_otsreport_export.m_ReportApp.im_ParticlesGridDevidePage.SaveMarkParticleRectangleOnFieldFile(dt_GridDevidePage, out vs ,out data);
 
             string str_path_FIELD_FILES_MARK = str_resultPath + "\\FIELD_FILES_MARK\\";
             DirectoryInfo theFolder = new DirectoryInfo(str_path_FIELD_FILES_MARK);
@@ -448,7 +459,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                             if (str_fieldid==vs[i].ToString())
                             {
                                 //在数据表中有颗粒在该帧图中的话，则对该帧图标记图像进行读取存入数据库
-                                DataRow[] datarowlist = dt_ParticlesGridDevidePage.Select(" fieldid = " + str_fieldid);
+                                DataRow[] datarowlist = dt_GridDevidePage.Select(" fieldid = " + str_fieldid);
                                 if (datarowlist.Count() > 0)
                                 {
                                     Bitmap ls_bp_fieldmark = new Bitmap(nextifile.FullName);
@@ -633,6 +644,8 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             {
                 if (dt_ParticlesGridDevidePage.Rows[i_row]["element"].ToString() == "")
                     continue;
+                if (dt_ParticlesGridDevidePage.Rows[i_row]["TypeName"].ToString() == "Not Identified")
+                    continue;
                 //获取颗粒的fieldid,和particleid
                 string str_fieldid = dt_ParticlesGridDevidePage.Rows[i_row]["fieldid"].ToString();