Merge branch 'GSP' of http://36.129.169.60:30080/gogsadmin/OTS into GSP

Bin/x64/Debug/Config/SysData/OTSProgMgrParam.pmf

@@ -7,7 +7,7 @@
     <Member RegName="IncArea" end="1000" start="10" />
     <Member RegName="ParticleGray" end="255" start="0" />
   </Member>
-  <Member RegName="ImageScanParam" FieldDistributeMode="0:Normal" ImageResolution="5:_1536_1024" SatrtImageMode="1:Snake" ScanImageSpeed="0:low" StopMode="0:CoverMode" StopParamArea="10" StopParamFields="2" StopParamMeasTime="360" StopParamParticles="5000" />
+  <Member RegName="ImageScanParam" FieldDistributeMode="0:Normal" ImageResolution="3:_1024_768" SatrtImageMode="1:Snake" ScanImageSpeed="0:low" StopMode="0:CoverMode" StopParamArea="10" StopParamFields="2" StopParamMeasTime="360" StopParamParticles="5000" />
   <Member RegName="SpecialGrayParam" ToRun="false">
     <Collection RegName="GrayRangeList" />
   </Member>

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

@@ -119,7 +119,7 @@ namespace OTSIncAReportApp.DataOperation.DataAccess
             //存放查询数据的数据表
             DataTable DT = null;
 
-            string sql = "select 1 from IncAData";
+            string sql = "select 1 from IncAData  where SubParticles is not 'IsSubParticle'";
             DT = dbHelper.ExecuteDataTable(sql, null);
             return DT.Rows.Count;
 
@@ -132,7 +132,7 @@ namespace OTSIncAReportApp.DataOperation.DataAccess
         public DataTable GetAllParticle_DataTable()
         {
             DataTable DT = null;
-            string sql = "select * from IncAData where typeid > 9 and FieldId > -1";
+            string sql = "select * from IncAData where typeid > 9 and SubParticles is not 'IsSubParticle'";
             DT = dbHelper.ExecuteDataTable(sql, null);
             return DT;
         }
@@ -145,7 +145,7 @@ namespace OTSIncAReportApp.DataOperation.DataAccess
         public double GetparticleArea()
         {
             DataTable DT = null;
-            string sql = "select sum(Area) from IncAData where FieldId > -1";
+            string sql = "select sum(Area) from IncAData where SubParticles is not 'IsSubParticle'";
             DT = dbHelper.ExecuteDataTable(sql, null);
             if (DT == null) return 0;
             double particleArea = 0;