修复报告BUG帧图导出颗粒重复

Bin/x64/Debug/Config/ProData/lj.psf

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData FileMark="626" Name="LiJi1" Sizes="0,0.5,1,2,5,30,100" Version="1.1.1" />
+<XMLData FileMark="626" Name="LiJi1" Sizes="0.5,1,2,5,30,100,200" Version="1.1.1" />

Bin/x64/Debug/Config/ProData/lj2.psf

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData FileMark="626" Name="LiJi2" Sizes="5,15,25,50,80,100" Version="1.1.1" />
+<XMLData FileMark="626" Name="LiJi2" Sizes="0,5,15,25,50,80,100,200" Version="1.1.1" />

Bin/x64/Debug/Config/ReportTemplate/CleannessA_Template/ReportTemplateConfig.xml

@@ -11,7 +11,7 @@
     </str_bz>
     <str_xzkl>全部颗粒</str_xzkl>
     <int_xzkl>0</int_xzkl>
-    <LOGName>ReportIdentification.bmp</LOGName>
+    <LOGName>null.png</LOGName>
     <StandardLibraryName>OTS_TC_Axia_per.db</StandardLibraryName>
   </M_SY>
   <M_YMYJ>

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

@@ -68,7 +68,7 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
             DataTable m_bt_DBData = fielddata.GetAreaByAllIncA("");//获取所有分类面积和数量信息
           
             DataTable data;
-            if (m_mbszclass.list_str_MainPriority.Count==0)
+            if (m_mbszclass.list_str_MainPriority_Serial.Count==0)
             {
                 data = m_bt_DBData.Copy();
             }
@@ -77,9 +77,9 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
                 data = m_bt_DBData.Clone();
                 for (int i = 0; i < m_bt_DBData.Rows.Count; i++)
                 {
-                    for (int a = 0; a < m_mbszclass.list_str_MainPriority.Count; a++)
+                    for (int a = 0; a < m_mbszclass.list_str_MainPriority_Serial.Count; a++)
                     {
-                        if (m_bt_DBData.Rows[i]["TypeName"].ToString() == m_mbszclass.list_str_MainPriority[a])
+                        if (m_bt_DBData.Rows[i]["TypeId"].ToString() == m_mbszclass.list_str_MainPriority_Serial[a])
                         {
                             data.Rows.Add(m_bt_DBData.Rows[i].ItemArray);
                             continue;
@@ -278,16 +278,16 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
                 }
             }
 
-            if (m_mbszclass.list_str_MainPriority.Count==0)
+            if (m_mbszclass.list_str_MainPriority_Serial.Count==0)
             {
                 return ConSolidateInvalid(dataTable);
             }
             DataTable data = m_bt_DBData.Clone();
             for (int i = 0; i < m_bt_DBData.Rows.Count; i++)
             {
-                for (int a = 0; a < m_mbszclass.list_str_MainPriority.Count; a++)
+                for (int a = 0; a < m_mbszclass.list_str_MainPriority_Serial.Count; a++)
                 {
-                    if (m_bt_DBData.Rows[i]["TypeName"].ToString() == m_mbszclass.list_str_MainPriority[a])
+                    if (m_bt_DBData.Rows[i]["TypeId"].ToString() == m_mbszclass.list_str_MainPriority_Serial[a])
                     {
                         data.Rows.Add(m_bt_DBData.Rows[i].ItemArray);
                         continue;
@@ -327,7 +327,7 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
             DataTable m_bt_DBData = InvalidRemoval(basicData.getParticleData().GetAreaByAllIncA(""));
 
             DataTable AreaInformationOfAllElements;
-            if (m_mbszclass.list_str_MainPriority.Count==0)
+            if (m_mbszclass.list_str_MainPriority_Serial.Count==0)
             {
                 AreaInformationOfAllElements = m_bt_DBData.Copy();
             }
@@ -336,9 +336,9 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
                 AreaInformationOfAllElements = m_bt_DBData.Clone();
                 for (int i = 0; i < m_bt_DBData.Rows.Count; i++)
                 {
-                    for (int a = 0; a < m_mbszclass.list_str_MainPriority.Count; a++)
+                    for (int a = 0; a < m_mbszclass.list_str_MainPriority_Serial.Count; a++)
                     {
-                        if (m_bt_DBData.Rows[i]["TypeName"].ToString() == m_mbszclass.list_str_MainPriority[a])
+                        if (m_bt_DBData.Rows[i]["TypeId"].ToString() == m_mbszclass.list_str_MainPriority_Serial[a])
                         {
                             AreaInformationOfAllElements.Rows.Add(m_bt_DBData.Rows[i].ItemArray);
                             continue;

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

@@ -887,19 +887,19 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
                 }
             }
 
-            if (m_mbszclass.list_str_MainPriority.Count==0)
+            if (m_mbszclass.list_str_MainPriority_Serial.Count==0)
             {
                 return m_bt_DBData;
             }
 
             DataTable datass = m_bt_DBData.Clone();
 
-            for (int i=0;i< m_mbszclass.list_str_MainPriority.Count;i++)
+            for (int i=0;i< m_mbszclass.list_str_MainPriority_Serial.Count;i++)
             {
                 bool bl = false;
                 for (int a = 0; a < m_bt_DBData.Rows.Count; a++)
                 {
-                    if (m_bt_DBData.Rows[a]["TypeName"].ToString() == m_mbszclass.list_str_MainPriority[i])
+                    if (m_bt_DBData.Rows[a]["TypeId"].ToString() == m_mbszclass.list_str_MainPriority_Serial[i])
                     {
                         datass.Rows.Add(m_bt_DBData.Rows[a].ItemArray);
                         bl = true;

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

@@ -312,7 +312,7 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
             DataTable btb = InvalidRemoval(fielddata.GetIncaSurfaceData(m_mbszclass.M_KLLBXX.list_str_kllb_qcys));
 
             DataTable dt;
-            if (m_mbszclass.list_str_MainPriority.Count == 0)
+            if (m_mbszclass.list_str_MainPriority_Serial.Count == 0)
             {
                 dt = btb.Copy();
             }
@@ -321,9 +321,9 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
                 dt = btb.Clone();
                 for (int i = 0; i < btb.Rows.Count; i++)
                 {
-                    for (int a = 0; a < m_mbszclass.list_str_MainPriority.Count; a++)
+                    for (int a = 0; a < m_mbszclass.list_str_MainPriority_Serial.Count; a++)
                     {
-                        if (btb.Rows[i]["TypeName"].ToString() == m_mbszclass.list_str_MainPriority[a])
+                        if (btb.Rows[i]["TypeId"].ToString() == m_mbszclass.list_str_MainPriority_Serial[a])
                         {
                             dt.Rows.Add(btb.Rows[i].ItemArray);
                             continue;