颗粒列表添加全部颗粒显示及导出功能

OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage/ParticlesGridDevidePage.cs

@@ -79,7 +79,8 @@ namespace OTSIncAReportGrids
             analyticalParticle = 0,
             selectParticles = 1,
             otherParticles = 2,
-            MergeParticles = 3
+            MergeParticles = 3,
+            allParticles=4
         }
 
         #region 分页器相关
@@ -364,7 +365,10 @@ namespace OTSIncAReportGrids
                 {
                     particlesAll = Particledata.GetInfoForPartucleDevidePage_mergeParticles(condition);
                 }
-
+                if (sel == (int)SelItem.allParticles)
+                {
+                    particlesAll = Particledata.GetInfoForPartucleDevidePage_allParticles(condition);
+                }
                 particlesAll.Columns.Add("Hardness");
                 particlesAll.Columns.Add("Density");
                 particlesAll.Columns.Add("Electrical_conductivity");

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.cs

@@ -186,7 +186,7 @@ namespace OTSIncAReportApp
             AddGridData(OTS_REPORT_PROP_GRID_ITEMS.STD_ID, "ClassifyId", OTS_ITEM_TYPES.COMBO, false, "std list", stdlistname[0], stdlistname, null);
 
             //颗粒列表数据类型
-            List<string> list_PARTICE_LIST = new List<string>() { analyticalParticle, selectParticles, otherParticles, MergeParticles };
+            List<string> list_PARTICE_LIST = new List<string>() { analyticalParticle, selectParticles, otherParticles, MergeParticles, allParticles };
             AddGridData(OTS_REPORT_PROP_GRID_ITEMS.PARTICE_LIST, dataSourceType, OTS_ITEM_TYPES.COMBO, false, "data source type", list_PARTICE_LIST[0], list_PARTICE_LIST, 0);
         }
         #region 属性Grid相关方法

OTSIncAReportApp/3-ServiceCenter/DataOperation/DataAccess/ParticleData.cs

@@ -610,11 +610,15 @@ namespace OTSIncAReportApp.DataOperation.DataAccess
             string sqliteString = "select fieldid,particleid,AveGray,RectLeft,RectTop,RectWidth,RectHeight,Area,PosX,PosY,TypeId,SegmentNum,FieldPosX " +
                 "as 'SEMPosX',FieldPosY as 'SEMPosY',XrayId,DMAX,DMIN,DPERP,PERIMETER,ORIENTATION,DINSCR,DMEAN,DELONG,DFERET,TypeName,TypeColor,SubParticles,''as Element from MergedParticleInfo where 1=1 " + condition;
             DataTable DT = new DataTable();
+            DT = dbHelper.ExecuteQuery(sqliteString);
+            return DT;
+        }
 
-
-
-
-
+        public DataTable GetInfoForPartucleDevidePage_allParticles(string condition)
+        {
+            string sqliteString = "select fieldid,particleid,AveGray,RectLeft,RectTop,RectWidth,RectHeight,Area,PosX,PosY,TypeId,SegmentNum,SEMPosX,SEMPosY,XrayId,DMAX,DMIN,DPERP,PERIMETER,ORIENTATION,DINSCR,DMEAN,DELONG,DFERET,TypeName,TypeColor,'' as Element from INcAData where 1=1 " +
+                condition;
+            DataTable DT = new DataTable();
             DT = dbHelper.ExecuteQuery(sqliteString);
             return DT;
         }