Merge branch 'ZJX' into Release2.3

Bin/x64/Debug/Config/ProData/ReportTemplateConfig.xml

@@ -88,7 +88,7 @@
       <YS7>Mn</YS7>
     </list_str_tb_lllb_sxys>
     <b_ck_kllb_ystx>True</b_ck_kllb_ystx>
-    <b_ck_kllb_fdtx>True</b_ck_kllb_fdtx>
+    <b_ck_kllb_fdtx>False</b_ck_kllb_fdtx>
     <b_ck_kllb_npxx>True</b_ck_kllb_npxx>
   </M_KLLBXX>
   <M_address>

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.cs

@@ -385,13 +385,25 @@ namespace OTSIncAReportApp
                 sampleData = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE];
                 list.Add(sampleData);
 
-               var sampleData1 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE];
-                list.Add(sampleData1);
 
                 //数据表类型
-
                 var sampleData3 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_TABLE_TYPE];
                 list.Add(sampleData3);
+                if ((int)sampleData3.itemVal==(int)CALCULATE_TABLE_TYPE.PARTICALE_GENE_INFO)
+                {
+                    var sampleData1 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE];
+                    list.Add(sampleData1);
+                }
+                if ((int)sampleData3.itemVal == (int)CALCULATE_TABLE_TYPE.AVE_ELEMENT_COMP)
+                {
+                    var sampleData1 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE];
+                    list.Add(sampleData1);
+                }
+                if ((int)sampleData3.itemVal == (int)CALCULATE_TABLE_TYPE.ELEMENT_COMP)
+                {
+                    var sampleData1 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE];
+                    list.Add(sampleData1);
+                }
                 if ((int)sampleData3.itemVal == (int)CALCULATE_TABLE_TYPE.PARTICALE_SIZE_DISTRIBUTION )
                 {
                     //粒级表
@@ -400,19 +412,20 @@ namespace OTSIncAReportApp
                     list.Add(sampleData_partsizefile);
 
                     //尺寸计算方法
-
-
                     var sampleData5 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE];
                     list.Add(sampleData5);
+
+                    var sampleData1 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE];
+                    list.Add(sampleData1);
                 }
                 if ((int)sampleData3.itemVal == (int)CALCULATE_TABLE_TYPE.PARTICALE_COMP)
                 {
                     //尺寸计算方法
-
-
                     var sampleData5 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE];
                     list.Add(sampleData5);
 
+                    var sampleData1 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE];
+                    list.Add(sampleData1);
                 }
 
                 

OTSIncAReportApp/1-UI/OTSTemplateDesigner/OTSReport_TemplateDesignerRM.cs

@@ -750,7 +750,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                     list_str = m_OTSReport_Export.m_ReportApp.m_rstDataMgr.GetPartSizeFileList();
                     break;
                 case OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE://数据类型，全部颗粒，分析颗粒
-                    //list_str = m_OTSReport_Export.m_ReportApp.m_DataMgrFun.GetDataSourceTypeList();
+                    list_str = m_OTSReport_Export.m_ReportApp.m_rstDataMgr.ParticleRange();
                     break;
                 case OTS_REPORT_PROP_GRID_ITEMS.TRIO_CHART_TYPE://三元相图模板
                     list_str = m_OTSReport_Export.m_ReportApp.m_rstDataMgr.GetTriTemplateNameList();

OTSIncAReportApp/2-CommonFunction/OTSDataMgrFunction/ResultDataMgr.cs

@@ -259,7 +259,11 @@ namespace OTSIncAReportApp.OTSDataMgrFunction
             List<string> ret_list = new List<string>() { "DMAX", "DMIN", "CIRCLE", "FERET" };
             return ret_list;
         }
-
+        public List<string> ParticleRange()
+        {
+            List<string> pr_str = new List<string>() { "全部颗粒","选择颗粒" };
+            return pr_str;
+        }
 
 
         #endregion